Bazaar Workflow

[John Arbash Meinel]

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

Jelmer Vernooij wrote:
> Philippe Lhoste wrote:
>> On 06/04/2009 18:16, Philippe Lhoste wrote:
>>> Ah, and after merge, we still have to commit changes, while pull does
>>> all this in the same stroke.
>> Ah, that's the culprit of pull! Uncommitted changes are committed,
>> ready or not. Good to know. merge --force seems to be the path to take
>> in such case.
> Pull does *not* automatically commit your local uncommitted changes. It
> will merge upstream changes into your working tree, just like "bzr merge
> --force" does. I don't think there are any Bazaar commands except for
> "bzr commit" itself that automatically commit your local uncommitted
> changes.
> 
> Cheers,
> 
> Jelmer

pull and update both apply the upstream changes to your local working
tree, and move the tip pointer of the branch.

They *won't*:

1) commit anything in your working tree
2) handle diverged branches (well, update can, but if you are using a
checkout, you generally are trying to avoid creating divergence)

If I was trying to replicate Philippe's P4 working, I would definitely
use a checkout, and then you would use "bzr up" to bring in the remote's
changes into your local code. "bzr commit" would then ensure that you
have the latest, and it would automatically push your latest version
back to the remote.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAknaMQAACgkQJdeBCYSNAAN+UgCgxCxqvnHZEaiFThSxy1Mtu8Xl
AJIAn3DKaLxzVe9b2fDLiCQYnvfleY6M
=+w/4
-----END PGP SIGNATURE-----