Subversion: merge moved file

Question

I've moved (renamed) a file in a local SVN directory:

svn move src_file_path dst_file_path

When I've tried to svn up, I got:

D     C src_file_path
      >   local delete, incoming edit upon update

This means someone else edited the file that I moved.

How do I merge the changes made by the other contributor into the new location?

PS - This is the same branch, unlike this question.

score 1 · Answer 1 · answered Feb 12 '12 at 22:39

You got a tree conflict. Take the Show > Tree Conflicts option and then take the Resolve option on the tree conflict. This will launch a wizard that gives you options based on the conflict. In this case, one of those will help you merge changes into the new location.

score -1 · Answer 2 · answered Feb 12 '12 at 11:33

-1

Merge file in WC with file in repo

answered Feb 12 '12 at 11:33

Lazy Badger

94,711
9
78
110

@AdamMatan `svn help merge` is *old fashion* now?! – Lazy Badger Feb 12 '12 at 16:09
1

"RTFM" isn't the spirit of SO. Why not supply a clear, working solution that ranr can refer to? – Adam Matan Feb 13 '12 at 07:34

Subversion: merge moved file

2 Answers2