Remote Merge

[Jan Hudec]

On Fri, Oct 28, 2005 at 08:40:41 -0400, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Jan Hudec wrote:
> > Pardon me, but pull is NOT able to merge anything -- that's what makes it
> > different from merge.
> 
> Pull does a merge, just like Arch and CVS.  But it does not do the merge
> if it cannot update the history first.

Sorry. Didn't realize the working copy case.

> >>Which is a fuzzy operation, and thus difficult to do from remote.
> >>Yes, it is possible. But it means changing merge() and WorkingTree to
> >>support operating over a Transport.
> >>If people feel it is a must, then we can do it. But that change would
> >>propagate to a lot of other code.
> > 
> > 
> > We should NOT do it. Merge result should never ever be placed anywhere else
> > than the working copy.
> 
> We were discussing doing a merge in the remote working copy.

Hm, if there should be a working copy at all, it shouldn't be modified
anyway. If it is modified, you had to make them and you will have to commit
them, so you can probably pull from there too.

-- 
						 Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- 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/20051029/ab4fc212/attachment.pgp