[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] Re: <<< conflict markers

From: Aaron Bentley
Subject: Re: [Gnu-arch-users] Re: <<< conflict markers
Date: Thu, 15 Apr 2004 01:35:53 -0400
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.6b) Gecko/20031205 Thunderbird/0.4

Jan Hudec wrote:

On Wed, Apr 14, 2004 at 17:10:34 -0400, Stefan Monnier wrote:

But it would have the same effect as `tla star-merge --three-way', so it
would be a bit redundant.

With star-merge the conflicts are from the HIS tree; with update, the conlicts are from the MINE tree.

But star-merge is far less efficient for this.

Sounds like a good reason to improve star-merge's performance ;-).

star-merge is principialy less efficient. Star-merge must build the
ancestor and mine versions always, because of it's generality.

star-merge doesn't build mine. That's the project tree. It always builds ancestor and his. "his" is the latest (or specified) revision of the tree version.

Update also builds ancestor and his. It builds ancestor to perform the undo. It builds his in the project tree. Then it applies the delta between ancestor and mine to his.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]