-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 8/2/10 4:31 PM, Neal Becker wrote:
> OK, got mercurial updated for devel, apparantly OK. Now try to update f13:
>
> fedpkg switch-branch f13
> Branch f13 set up to track remote branch f13/master from origin.
>
> [nbecker@nbecker1 mercurial]$ git merge master
> Updating f6a7cf0..33f33a6
> Fast-forward
> .gitignore | 2 ++
> mercurial.spec | 10 ++++++++--
> sources | 2 +-
> 3 files changed, 11 insertions(+), 3 deletions(-)
Here is where you should have done a fedpkg or git push
> [nbecker@nbecker1 mercurial]$ fedpkg build
> Traceback (most recent call last):
> File "/usr/bin/fedpkg", line 959, in <module>
> args.command(args)
> File "/usr/bin/fedpkg", line 319, in build
> url, chain)
> File "/usr/lib/python2.6/site-packages/pyfedpkg/__init__.py", line 797, in
> build
> raise FedpkgError('There are unpushed changes in your repo')
> pyfedpkg.FedpkgError: There are unpushed changes in your repo
>
This shouldn't traceback, rather just give you the error message. The
message is right, you have stuff you haven't pushed.
> [nbecker@nbecker1 mercurial]$ git status
> # On branch f13
> # Your branch is ahead of 'origin/f13/master' by 31 commits.
> #
> nothing to commit (working directory clean)
The changes are already committed, that's how it knows you are ahead of
master by 31 commits.
>
> [nbecker@nbecker1 mercurial]$ fedpkg commit -p
> # On branch f13
> # Your branch is ahead of 'origin/f13/master' by 31 commits.
> #
> nothing to commit (working directory clean)
> Could not commit: Command '['git', 'commit', '-a']' returned non-zero exit
> status 1
There is nothing to commit, since all the changes are already committed.
>
> [nbecker@nbecker1 mercurial]$ git push
> To ssh://nbecker@xxxxxxxxxxxxxxxxxxxxxx/mercurial
> ! [rejected] master -> master (non-fast-forward)
> error: failed to push some refs to
> 'ssh://nbecker@xxxxxxxxxxxxxxxxxxxxxx/mercurial'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes before pushing again. See the 'Note about
> fast-forwards' section of 'git push --help' for details.
>
> OK, I give up.
Somebody has changed master since you last touched it, and you had
changes on your local master that are out of sync now. First, you
should do:
git config --add --global push.default tracking
This will make git push only attempt to push to the branch you are
tracking. Then you can git push your f13 changes. git checkout master
to get back to master and do a git pull --rebase to pull in the latest
upstream changes and re-play your unpushed changes on top of it. Then
git log to see what has happened, push if necessary.
- --
Jesse Keating
Fedora -- Freedom² is a feature!
identi.ca: http://identi.ca/jkeating
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAkxXWWkACgkQ4v2HLvE71NV9SQCeKL50F3iibsquSlwDGJ595wM5
SmUAniE+6rf25VAF7KRub+V/Wz6WG1Mo
=i6bO
-----END PGP SIGNATURE-----
--
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/devel
