Solving tree conflicts due to renames

I'm currently investigating how best to solve tree conflicts in subversion/tortoisesvn and think I could do with some pointers. I'm using tsvn-1.7.4 and file:/// access to a test repo.

My test repo consisted of:

|
|- trunk
| |- a.txt
|
|- branches
  | - test
      | - a.txt

I'd merged trunk successfully in to test branch so they were up to date with each other. I then modified a.txt on trunk at rev 8 and on the branch I renamed a.txt to b.txt at rev 9.

I then merged from trunk again and as expected, received a tree conflict. The edit conflict dialog says the source left is trunk/a.txt_at_1 and source right is trunk/a.txt_at_9

This info seems wrong as the left should be a.txt on the branch but I guess this is because a.txt is deleted on the branch.

The only option I'm given is to 'mark the conflict as resolved'.

I see no easy way to launch my merge program with the change it's pulled in for a.txt from trunk and pick b.txt as the file to merge to. Do I really have to go and find the revs being merged and create a diff file for a.tx on trunk for these revisions and them manually apply it to b.tx on the branch?

If so then perhaps tsvn could give some help here by letting me tell it where a.txt had been renamed to so that I can try and merge the diffs. For us, this will be the most common way to resolve tree conflicts due to renames until svn actually supports this.

Any other suggestions as I don't want to lose the changes from a.txt that were made on trunk, but want to be able to apply them to b.txt on the branch.

Thanks

Russell

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2909094

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-01-16 10:51:51 CET