This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: Zack's list of requirements
- From: Mike Stump <mrs at apple dot com>
- To: Tom Lord <lord at emf dot net>
- Cc: gcc at gnu dot org
- Date: Mon, 9 Dec 2002 14:55:30 -0800
- Subject: Re: Zack's list of requirements
On Monday, December 9, 2002, at 02:20 AM, Tom Lord wrote:
2f. Perform conflict resolution by automatic formation of
microbranches.
Intriguing, but I don't completely understand what you want.
Given that you do a lot of merging, I'd like to talk with you at
greater length about conflict resolution.
I don't know if what I want it related to what Zack mentioned above,
but what I want is an ability to handle this problem:
You have a local change... Someone else pounds in 100 changes to the
base code, you merge up, the 100 changes go into your tree in one hunk,
causing merging conflicts, rightly so. If we take a step back (revert
to pre-merge status), and then apply each one of the 100 changes, they
all apply... Also, the system should be able to take the base, pull
out your changes, put in the 100 changes, then put your changes in...
Or a combination of the two, where the system combines both strategies.
All of this should be automatic and find the best solution first, and
flexible enough to allow the user to say, I know you wanted to do it
that way, but I want to do it this way.
The idea is to reduce the work the user has to do to resolve conflicts.
Zack, is this close to what you want? If not, I'd like to hear some
more details...