attn: abentley Re: [BUG] Merging repositories with a directory deleted

[Robert Collins]

On Thu, 2005-09-15 at 09:14 -0400, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Robert Collins wrote:
> > Now, there is an interesting thing here, the last step of baz2bzr
> > applies a delta to change its starting point into the current head, but
> > this can fail due to conflicts - is it possible to tell merge 'just do
> > it' as opposed to 'conflicts can happen' ?
> 
> We can handle conflicts whatever way we like and vary it by command (in
> fact, I've got an Arch-style conflict handler somwhere), but I'm not
> sure what you mean here.
> 
> baz2bzr should be doing just a two-way transform, i.e.
> base_tree=branch.revision_tree(last_rev), this_tree=base_tree
> other_tree=branch.basis_tree().
> 
> That simplification (this_tree=base_tree) assumes that the user hasn't
> changed the working tree such that it differs from the last revision.
> If they have, why wouldn't we use normal conflict handling?  (And yes,
> not throw an exception.)
> 
> That behaviour is in line with pull, which seems like the closest
> equivalent to baz-import.

MMm. The error I saw was with an unmodified bzr tree, it just blew up. I
can probably reconstruct that, though it takes about a day to generate
the data needed :[.

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/20050916/be53a114/attachment.pgp