1 more git problem
Updating mercurial (stop laughing) to 1.6.3. I updated master, f14, f13. Made some mistake on f12. Now: git status # On branch f12 # Your branch is ahead of 'origin/f12/master' by 1 commit. # nothing to commit (working directory clean) git merge master Already up-to-date. fedpkg build Could not initiate build: There are unpushed changes in your repo -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: 1 more git problem
Am 26.08.10 20:58, schrieb Neal Becker: Updating mercurial (stop laughing) to 1.6.3. I updated master, f14, f13. Made some mistake on f12. Now: git status # On branch f12 # Your branch is ahead of 'origin/f12/master' by 1 commit. # nothing to commit (working directory clean) git merge master Already up-to-date. fedpkg build Could not initiate build: There are unpushed changes in your repo I would try to make a fedpkg push before you should initate a fedpkg build. Of course, you may get an error message during the fedpkg push. In this case you should make a git pull to get the most recent changes from the remove repository. Best Regards: Jochen Schmitt -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: 1 more git problem
On Thu, Aug 26, 2010 at 02:58:40PM -0400, Neal Becker wrote: Updating mercurial (stop laughing) to 1.6.3. I updated master, f14, f13. Made some mistake on f12. Now: git status # On branch f12 # Your branch is ahead of 'origin/f12/master' by 1 commit. fedpkg build Could not initiate build: There are unpushed changes in your repo There is one commit in your local clone, that is not pushed to the server. With git diff origin/f12/master you can see the changes. And if you want to push it and it is not the mistake you made, you can use fedpkg push to push it to the server. Regards Till pgpS09LP1A8mY.pgp Description: PGP signature -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: 1 more git problem
Jochen Schmitt wrote: Am 26.08.10 20:58, schrieb Neal Becker: Updating mercurial (stop laughing) to 1.6.3. I updated master, f14, f13. Made some mistake on f12. Now: git status # On branch f12 # Your branch is ahead of 'origin/f12/master' by 1 commit. # nothing to commit (working directory clean) git merge master Already up-to-date. fedpkg build Could not initiate build: There are unpushed changes in your repo I would try to make a fedpkg push before you should initate a fedpkg build. Of course, you may get an error message during the fedpkg push. In this case you should make a git pull to get the most recent changes from the remove repository. Best Regards: Jochen Schmitt git pull Already up-to-date. [nbec...@nbecker1 mercurial]$ fedpkg push Total 0 (delta 0), reused 0 (delta 0) To ssh://nbec...@pkgs.fedoraproject.org/mercurial e5a8787..397992d f12 - f12/master [nbec...@nbecker1 mercurial]$ fedpkg build ... OK, that seems to have gotten things going. But, I hope this doesn't mean f12 is out of sync with f13, f14, master. They should all be identical. -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: 1 more git problem
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
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
Re: 1 more git problem
On Thu, 2010-08-26 at 15:56 -0400, Matt McCutchen wrote:
$ git show-branch remotes/origin/{f12/,f13/,f14/,}master
$ git diff refs/remotes/origin/{f12,f13}/master
To avoid any possible confusion: the inconsistency in the arguments I
used was just sloppy, it doesn't have a special meaning. git
automatically tries several common prefixes on its arguments (see the
git-rev-parse man page), so it doesn't matter whether the
remote-tracking branch names are written in full or without the leading
refs/ or refs/remotes/ .
Please pardon the noise.
--
Matt
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
Re: 1 more git problem
On Thu, Aug 26, 2010 at 03:16:14PM -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. I usually gitk --all to check this. The green labels need all to point to the same commit for all to be equal. Btw. there are also helpful tutorials available here: http://gitready.com/ Regards Till pgpBJX86XwDfA.pgp Description: PGP signature -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
Re: 1 more git problem
2010/8/26 Till Maas opensou...@till.name: On Thu, Aug 26, 2010 at 03:16:14PM -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. I usually gitk --all to check this. The green labels need all to point to the same commit for all to be equal. Strictly speaking, the trees can be equal even if the commits differ (because the metadata, which is also part of the hash, differs). - Thomas -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
