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

[Cameron Patrick]

Matthieu Moy wrote:

> star-merge --three-way works in a very different way. It doesn't rely
> on patches, but on the full text verison of you file, the file to
> merge, and the common ancestor. Then, diff3 can do the merge using
> those diff3 markers for conflicts.

Surely a hypothetical `tla apply-changeset --three-way` could do the
same, where the 'ancestor' could be specified as an option (perhaps
defaulting to the latest revision of the project tree?).  The file to
merge would be generated by applying the changeset to the specified
ancestor.  (Obviously this would only work if there was an ancestor
which the given changeset could be applied cleanly to.)

The arch_apply_changeset() function has a use_diff3 parameter, which
star-merge uses.  The source to apply_changeset is scary!  However
changing the apply-changeset command to use it doesn't look /too/
hard.  It's not an itch that I feel particularly compelled to scratch,
though: I must be one of the few people who usually prefer to have a
.rej file to CVS-style conflict markers.

If you were going to add a three-way option to apply-changeset, it
would probably be worth doing the same to apply-delta, update and
replay too, for completeness.

Disclaimer: it is entirely likely that I have missed something obvious
and the above is completely wrong.

Cameron.

signature.asc
Description: Digital signature