On Thu, 2010-08-26 at 15:16 -0400, Neal Becker wrote:
But, I hope this doesn't mean f12 is out of sync with f13, f14,
master.
They should all be identical.
It looks like f12, f14, and rawhide are all the same, and f13 has one
extra commit:
$ git show-branch remotes/origin/{f12/,f13/,f14/,}master
! [remotes/origin/f12/master] Update to 1.6.3
! [remotes/origin/f13/master] Update to 1.6.3
! [remotes/origin/f14/master] Update to 1.6.3
! [remotes/origin/master] Update to 1.6.3
----
+ [remotes/origin/f13/master] Update to 1.6.3
++++ [remotes/origin/f12/master] Update to 1.6.3
The difference in f13 is:
$ git diff refs/remotes/origin/{f12,f13}/master
diff --git a/mercurial.spec b/mercurial.spec
index 60e2588..9f3d1ce 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -151,13 +151,16 @@ rm -rf $RPM_BUILD_ROOT
%dir %{python_sitearch}/hgext
%files -n emacs-%{pkg}
+%defattr(-,root,root,-)
%{emacs_lispdir}/*.elc
%{emacs_startdir}/*.el
%files -n emacs-%{pkg}-el
+%defattr(-,root,root,-)
%{emacs_lispdir}/*.el
%files hgk -f %{name}-hgk.files
+%defattr(-,root,root,-)
%{_libexecdir}/mercurial/
%{_sysconfdir}/mercurial/hgrc.d/hgk.rc
If you didn't want the extra commit, you can revert it with "git revert"
after switching to the f13 branch.
--
Matt