Repeated merges possible and displayed in brzr status

[Robert Collins]

On Wed, 2005-10-19 at 10:03 -0400, Aaron Bentley wrote:

> Though perhaps if a merge makes no file changes and pull would work, we
> should error out and suggest pull.

I would not error out, though suggesting pull is a good idea.

I.e. 
'No changes have occured, your branch is synchronised with $URL and you
are able to pull.'

The reason I dont want an error is that merge and pull are semantically
different for the user, not just different in terms of mechanism. *I*
never pull except for:
 * Branches that are just copies of someone elses work cached locally.
 * Copies of my own work that I'm keeping deliberately 'behind the
times' (i.e. the bzr I use is a few days older than integration, its
just a copy of integration, and I do a pull in it every couple of days).

Anything that involves someone elses work, or bringing my own work on a
feature into a higher level branch, I use 'merge' for.

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051023/91131414/attachment.pgp