This is the mail archive of the
mailing list for the GCC project.
Re: Zack's list of requirements
- From: kenner at vlsi1 dot ultra dot nyu dot edu (Richard Kenner)
- To: mrs at apple dot com
- Cc: gcc at gcc dot gnu dot org
- Date: Mon, 9 Dec 02 21:52:04 EST
- Subject: Re: Zack's list of requirements
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...
I'm missing something here. If those 100 changes cause conflict with
the local change, then won't the local change conflict to a tree with
those 100 changes installed?