[Top][All Lists]

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

Re: [Gnu-arch-users] Re: Graphical merges

From: Aaron Bentley
Subject: Re: [Gnu-arch-users] Re: Graphical merges
Date: Wed, 21 Apr 2004 17:45:51 -0400
User-agent: Mozilla Thunderbird 0.5 (X11/20040309)

Stefan Monnier wrote:
Basically, instead of 3 trees, I'd rather have 1 tree where each changed
<file> is replaced by something like <file>.orig, <file>.ancestor, and
<file>.new.  We'd also invent some way to represent file move/add/delete.
Then the merge can be done file-by-file with an obviously
fail-safe behavior.

You mean, not operate in the project tree at all, so you can't hurt it.

No: the "1 tree" would be the project tree.

So you're proposing renaming all files that changed in HIS to <file>.orig?


Aaron Bentley
Director of Technology
Panometrics, Inc.

reply via email to

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