merge vs pull

[Michael Ellerman]

On Tue, 29 Nov 2005 00:15, Jamie Wilkinson wrote:
> This one time, at band camp, Michael Ellerman wrote:
> >My point is these users don't need to know about merge, they just want to
> > grab the latest development code, try it out, and update it every now and
> > then. If they need to merge then something's gone wrong.
>
> .. if they hack on their own branch, and commit, then something's gone
> wrong? :)

Grrr, no if they're trying to maintain a mirror of a branch and they end up 
having to merge it's a bug. You knew that though didn't you :D

> >In fact I think it would be cool to have a 'mirror' command ...
>
> Call me daft, but I don't see how that differs from 'pull' right now...

Well I won't call you daft, just 'cause you might take it the wrong way over 
email ;) But ...

You can't pull into nowhere:

concordia ~$ mkdir bar
concordia ~$ cd bar
concordia ~/bar$ ls -la
total 16K
drwxr-xr-x    2 michael michael 4.0K 2005-11-29 02:11 .
drwxr-xr-x  121 michael michael 8.0K 2005-11-29 02:11 ..
concordia ~/bar$ bzr pull http://michael.ellerman.id.au/files/diffstat
bzr: ERROR: Not a branch: /

> I reckon I fit somewhere between the second and third categories above,
> working out the difference between merge and pull isn't hard.

Sure, I'm one category on some projects and another on others. That's not 
really the point, it's making the initial experience people have with bzr 
really _kick arse_.

cheers

-- 
Michael Ellerman
IBM OzLabs

email: michael:ellerman.id.au
inmsg: mpe:jabber.org
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051129/81650768/attachment.pgp