tree conflicts conflict with implementation of test for issue #2829
From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 24 Mar 2008 13:30:10 +0100
Going through the failing tests on the tree-conflict branch,
The test in quesion is this one:
The test stems from issue #2829. The problem seems to be that
1. Creating a branch off trunk:
# Create a WC with a single branch
2. Deleting a file in the branch:
# Delete A_COPY/B/E
3. And then merging new revs from trunk into the branch:
# Merge /A to /A_COPY ie., r1 to r4
... causes 'merge' to skip the deleted file.
However, on the tree-conflicts branch, this does not cause a skip
Quoting the "USE CASE 4" section from notes/tree-conflicts/detection.txt:
If 'svn merge' tries to modify a file that does not exist in the
So can the test be adjusted in a way that makes the merge cause
One idea that comes to mind is that skipped merges should still occur
Anyone involved in fixing issue #2829 around for comments?
-- Stefan Sperling <stsp_at_elego.de> Software Developer elego Software Solutions GmbH HRB 77719 Gustav-Meyer-Allee 25, Gebaeude 12 Tel: +49 30 23 45 86 96 13355 Berlin Fax: +49 30 23 45 86 95 http://www.elego.de Geschaeftsfuehrer: Olaf Wagner
This is an archived mail posted to the Subversion Dev mailing list.