Merging and parents

From: Matthias Urlichs <smurf@smurf.noris.de>
Date: 2005-07-06 02:19:33
I just had this ugly merge situation:

 M
 |\
 | \
 A  B
 |\/|
 |/\|
 C  D
 | /
 |/
 E

Suppose both the EC and the ED branch add files (not with conflicting
filenames!) which then get modified somewhere between C/D and M.

No matter which node gets picked as the parent, some files will end
up as "created on different branches" because the chosen parent doesn't
have them, even though, strictly speaking, it ain't so.

So ... what to do? Generate a list of parents, and for each file pick the
one parent where it (a) exists and (b) has the smallest diff?
Or just ignore (umm... OK, document) the problem?

-- 
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
I'm thankful I didn't believe in God, because it
would have been another thing for me to conquer.
		-- Kim Goldman


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Sat Jul 09 17:29:04 2005

This archive was generated by hypermail 2.1.8 : 2005-07-09 17:31:06 EST