Single file merge in Subversion

前端 未结 5 1448
粉色の甜心
粉色の甜心 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:32

    The merge, as Andrew recommended it, worked for me, but not for every file. I had three files, but for the third I got the error "...path not found". Adding the argument " --ignore-ancestry" solved that problem.

    But after merging I had strange modified/merged file status and a lot of svn:mergeinfo added to my working copy.

    So I decided to just do a simple copy&paste for single files to avoid such confusing stuff until we switch to Git where these tasks are really no problem at all ;)

提交回复
热议问题