Single file merge in Subversion

前端 未结 5 1500
粉色の甜心
粉色の甜心 2021-02-03 17:55

I\'m using Subversion 1.5 and have a single file in a branch that I want to merge into another branch. When I do a svn merge http://path/to/file I get an error,

5条回答
  •  忘掉有多难
    2021-02-03 18:18

    I think you need to do a

    svn merge http://server/repos/path/to -r 
    

    where is the revision where the file was added. That way merge information is recorded (in case of a Subversion 1.5 or higher repository).

提交回复
热议问题