[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: tla apply-changeset --three-way ??
From: |
Matthieu Moy |
Subject: |
[Gnu-arch-users] Re: tla apply-changeset --three-way ?? |
Date: |
Sat, 23 Oct 2004 13:51:13 +0200 |
User-agent: |
Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux) |
Cameron Patrick <address@hidden> writes:
> 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. 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.
--
Matthieu