Re: [PATCH][merge-tracking] Fix for failing testcase merge-tests.py:35
From: Daniel Rall <dlr_at_collab.net>
Date: 2006-09-18 04:04:02 CEST
On Tue, 12 Sep 2006, Kamesh Jayachandran wrote:
In merge-tracking/TODO, we said the following:
* If a conflict is encountered, invoke a conflict resolution
* Otherwise, stop applying merge ranges as soon as a second
So for merge test #35, we should record merge info the conflict, as
> 2. Shouldn't we check for historical relationships between source
No. Subversion has never required a historical relationship to exist
I've tweaked the formatting of your patch and committed it as r21525.
This is an archived mail posted to the Subversion Dev mailing list.