how do I get rid of "pending merges:"?
Erik Bågfors
zindar at gmail.com
Fri Jul 13 09:27:19 BST 2007
bzr revert will remote them.
/Erik
On 7/10/07, Sam Steingold <sds at podval.org> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> $ bzr pull
> Using saved location: http://bzr.xsteve.at/dvc/
> No revisions to pull.
> $ bzr merge
> Merging from remembered location http://bzr.xsteve.at/dvc/
> Nothing to do.
> $ bzr status
> pending merges:
> Stefan Reichoer 2007-06-18 Merged the patches mentioned on the mailing
> li...
> $ bzr remerge
> All changes applied successfully.
> $ bzr status
> pending merges:
> Stefan Reichoer 2007-06-18 Merged the patches mentioned on the mailing
> li...
> $
>
> am I at the latest and greatest revision?
> if yes, why do I have "pending merges"?
> if no, how do I merge them?
>
> thanks.
>
> (also, thanks for the "lint" answers)
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.6 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
>
> iD8DBQFGk8kMPp1Qsf2qnMcRAmKbAKCBIconcA5+PixxN69sqbD/tMZjUQCfVKbh
> WCFHu1I9O0KyTbEu/ChYQg0=
> =IoXn
> -----END PGP SIGNATURE-----
>
>
More information about the bazaar
mailing list