Re: 1 more git problem

2010-08-26 Thread Thomas Moschny
2010/8/26 Till Maas : > 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 a

Re: 1 more git problem

2010-08-26 Thread Till Maas
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 a

Re: 1 more git problem

2010-08-26 Thread Matt McCutchen
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

Re: 1 more git problem

2010-08-26 Thread Martin Sourada
On Thu, 2010-08-26 at 15:16 -0400, Neal Becker wrote: > 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 b

Re: 1 more git problem

2010-08-26 Thread Matt McCutchen
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/,}m

Re: 1 more git problem

2010-08-26 Thread Neal Becker
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 com

Re: 1 more git problem

2010-08-26 Thread Till Maas
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 ini

Re: 1 more git problem

2010-08-26 Thread Jochen Schmitt
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) > >

1 more git problem

2010-08-26 Thread 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