Using subversion 1.5 I have branch B which was branched off of branch A. After doing work in both branches I go to merge changes from A into B (using svn merge http://path/to/A in the working directory of B) and get svn: Target path does not exist. What does this mean?
views:
3944answers:
2
+3
A:
It means that there was a change in a file in branch A which Subversion tried to merge into branch B, but the file does not exist in branch B, so it has nowhere to merge the change. For example:
- Create branch B
- Change A/README
- Delete B/README
- Merge A -> B
Now the change in README cannot be applied in branch B, because the file has been removed there.
EDIT: This will result in a tree conflict in Subversion 1.6.
JesperE
2008-10-17 20:40:05
That makes sense. So how can you merge in cases like this?
timdisney
2008-10-17 21:21:57
Well, subversion skips the files with missing targets. I'm not really sure what happens when you try to merge back, though.
JesperE
2008-10-17 21:50:37
Using --ignore-ancestry removed the error for me and I was able to merge. I'm not really sure of the consequences though...
Costo
2009-04-29 18:21:31
A:
I was getting this error with svn 1.5.4 even when there were no incompatible changes. Upgrading to 1.5.5 fixed it for me.
Jon Bauman
2009-07-10 00:08:58