merge vs pull (was What we did at UBZ)

[Martin Pool]

On 21 Nov 2005, James Blackwell <jblack at merconline.com> wrote:
> > Aaron:
> > If it's a merge, you won't be able to pull.
> 
> 
> Of course... this is all a moot point if merge and pull are the same
> command. The user wouldn't be the wiser. :)

Sure, but that gets into a whole other bunch of issues previously
discussed.  Most importantly, after a merge, you need to commit.  I
don't want to give that up, because being able to review/test/edit the
merge results is important to maintaining user control on what goes
into a branch.  

Conversely, we want to be able to track another branch without
generating a lot of new commits, which implies some kind of
pull/mirror/sync thing.

Given the behaviour is rather different I think making them the same
command would be confusing (but I might be wrong.)  At any rate there do
seem to be two fundamentally different behaviours.

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051121/2cc189c6/attachment.pgp