Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Subversion: what does "Target path does not exist" when merging mean?

Tags:

merge

svn

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?

like image 970
timdisney Avatar asked Oct 17 '08 15:10

timdisney


People also ask

What is Subversion merge?

In Subversion terminology, the general act of replicating changes from one branch to another is called merging, and it is performed using various invocations of the svn merge subcommand. In the examples that follow, we're assuming that both your Subversion client and server are running Subversion 1.7 (or later).

Can we merge two branches in svn?

In the From URL option, you should specify the branch to which you want to merge. For example, assume that there are 2 branches, branch A and branch B , and you want to merge branch B to branch A . In TortoiseSVN, click on Merge option and then select Merge two different trees option.


1 Answers

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.

like image 140
JesperE Avatar answered Nov 15 '22 21:11

JesperE