Bazaar-NG documentation

[Stefan (metze) Metzmacher]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins schrieb:
>   If commits have been done to A (either by someone else pushing, or
> someone committing directly), then you need to either:
>     - cd to A, merge from your branch B, and bzr commit or
>     - make a new branch C from A, merge in your branch B, commit, and
> then bzr push.

Hi,

why can't bzr pull and bzr push try to do the merge job on the fly?
svk pull and svk push doesn't care if someone else has commited code.
I also like the interactive conflict handling, where you will be asked,
for review the local diff the remote diff, and open an editor to remove conflicts,
or you can choose to just keep the current file or take the remote file.
And that all with just one simple command, with no large command line to a merge command
where you need to find out the revision number, relative to each branch...

- --
metze

Stefan Metzmacher <metze at samba.org> www.samba.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3-nr1 (Windows XP)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDFqupm70gjA5TCD8RAv5iAJ91xACnSUqIzZT+qB9LABtKL9pI+gCgucR3
NXjry4Itpemj/rHO1b8NRGQ=
=4AkD
-----END PGP SIGNATURE-----