On 8/9/13 10:27 AM, John Maher wrote:
> And svn status returns this:
> C Build.bat
> > local add, incoming add upon merge
You svn add Build.bat in trunk. Later you svn add Build.bat in your
branch. Subversion sees those as separate objects with individual history.
If you had svn add Build.bat in the trunk, then merged to the branch
(without svn add Build.bat in the branch), then you'd have the same
object with history that has diverged. In this scenario you can make
changes in the trunk and in the branch (history for the one object
diverges) and later merge the changes between the branches (synchronize
the diverging histories).
So to recap, in your current scenario you have two objects each with one
history. In the correct scenario you have one object with two related
The svn book details how to deal with a scenario like this. You have to
svn delete Build.bat in the branch (but keep the changes somewhere),
commit, then merge from trunk (might need to use the --force argument, I
forget) putting Build.bat from trunk in your branch, then manually merge
the changes from the old Build.bat and the new Build.bat. Once you fix
this you should never need to perform this process again.
The conflicts reporting "local delete, incoming delete upon merge" occur
due to a similar reason.
Edwin G. Castro
Received on 2013-08-09 21:59:44 CEST