Re: [Gnu-arch-users] Re: tla apply-changeset --three-way ??

[Cameron Patrick]

Matthieu Moy wrote:

> > Surely a hypothetical `tla apply-changeset --three-way` could do the
> > same, where the 'ancestor' could be specified as an option
> 
> If there is such an ancestor, yes. But this is not necessarily the
> case.

You're right that it wouldn't work in general, but I believe Zenaan
was talking specifically about changesets produced by undo ?

> Typical scenario:
> 
> - X tags Y's A/C--B--V--patch-42 to AX/C--B--V--base-0
> - X hacks up to AX/C--B--V--patch-12
> - Y hacks up to A/C--B--V--patch-54
> - X tries to replay A/C--B--V--patch-54 on his tree.

Hmm.  I /think/ that in this case, specifying A/C--B--V--patch-53 as
an ancestor should work?

Cameron.

signature.asc
Description: Digital signature