1 more git problem

[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 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.
> 
> [nbecker at nbecker1 mercurial]$ fedpkg push
> Total 0 (delta 0), reused 0 (delta 0)
> To ssh://nbecker@pkgs.fedoraproject.org/mercurial
>    e5a8787..397992d  f12 -> f12/master
> 
> [nbecker at 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.
> 
Try 
$ git diff f12 f13

If they're different, this'll show you where. 

Martin


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: This is a digitally signed message part
Url : http://lists.fedoraproject.org/pipermail/devel/attachments/20100826/75328c18/attachment.bin