[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Error svn: E155010 when merging Add then Delete in the same merge operation

From: Andrea Antonio Maleci <A.Maleci_at_iwbank.it>
Date: Tue, 17 Apr 2012 12:00:09 +0200

Hi all,
I'm doing some sparse merge operation, unsing -r option.
If in the same merge action I merge a revision that contains an add action on a file and then another revision that contain a delete of the same file, I have the error:
svn: E155010: The node 'file' was not found.

Here an example:
In a branch:

1. I add a file and commit;

2. I delete the file and commit;

3. I add another file and commit.
I another branch:

1. I merge 1,2 and 3

2. I get the error.

[csvn_at_scm-master ~] $ svnadmin create TST
[csvn_at_scm-master ~] $ svn mkdir -m "Added branch" file://$HOME/tmp/wc/TST/branches file://$HOME/tmp/wc/TST/branches/branchA file://$HOME/tmp/wc/TST/branches/branchB<file:///\\$HOME\tmp\wc\TST\branches\branchB>
Committed revision 1.
[csvn_at_scm-master ~] $ cd branchA
[csvn_at_scm-master ~/branchA]$ echo "Hello" > file1.txt
[csvn_at_scm-master ~/branchA]$ svn add file1.txt
A file1.txt
[csvn_at_scm-master ~/branchA]$ svn commit -m "Added" .
Adding file1.txt
Transmitting file data .
Committed revision 2.
[csvn_at_scm-master ~/branchA]$ svn delete file1.txt
D file1.txt
[csvn_at_scm-master ~/branchA]$ svn commit -m "Delete" .
Deleting file1.txt
Committed revision 3.
[csvn_at_scm-master ~/branchA]$ echo "Hello" > file2.txt
[csvn_at_scm-master ~/branchA]$ svn add file2.txt
A file2.txt
[csvn_at_scm-master ~/branchA]$ svn commit -m "Added 2" .
Adding file2.txt
Transmitting file data .
Committed revision 4.

[csvn_at_scm-master ~/branchA]$ cd ..
[csvn_at_scm-master ~]$ svn co file://$HOME/tmp/wc/TST/branches/branchB
Checked out revision 4.
[csvn_at_scm-master ~]$ cd branchB
[csvn_at_scm-master ~/branchB]$ svn merge -r0:1 -r1:2 -r2:3 -r3:4 file://$HOME/tmp/wc/TST/branches/branchA .
--- Merging r2 into '.':
A file1.txt
--- Recording mergeinfo for merge of r2 into '.':
U .
--- Merging r3 into '.':
D file1.txt
--- Recording mergeinfo for merge of r3 into '.':
G .
svn: E155010: The node '/private/home/csvn/branchB/file1.txt' was not found.

The same result if I use
[csvn_at_scm-master ~/branchB]$ svn merge -c1 -c2 -c3 -c4 file://$HOME/tmp/wc/TST/branches/branchA .

I currently use svn, version 1.7.4 (r1295709)

Any Idea ??

Thanks,
Andrea
Received on 2012-04-17 12:00:46 CEST

This is an archived mail posted to the Subversion Users mailing list.