Subversion: what does “Target path does not exist” when merging mean?

前端 未结 3 867
暗喜
暗喜 2021-01-04 23:41

Using subversion 1.5 I have branch B which was branched off of branch A. After doing work in both branches I go to merge changes from A into B (using svn merge http://

相关标签:
3条回答
  • 2021-01-04 23:45

    I was getting this error with svn 1.5.4 even when there were no incompatible changes. Upgrading to 1.5.5 fixed it for me.

    0 讨论(0)
  • 2021-01-05 00:00

    I had this problem because my trunk and the branch had a strange history.

    Like this:

                  /---------\
    trunk -------+---+       +---\
                      \-----------BOOM!
    

    Merging trunk -> branch didn't work.

    Merging branch -> trunk worked though.

                  /---------\
    trunk -------+---+       +---+-----
                      \---------/
    

    Probably because the trunk had better information about the last ancestor that they shared.

    In my case, I wasn't ready to merge back to trunk, but I was able to create a new branch from the trunk and merge my old branch there.

                  /---------\
    trunk -------+---+       +---+-------
                      \           \---+--
                       \-------------/
    
    0 讨论(0)
  • 2021-01-05 00:01

    It means that there was a change in a file in branch A which Subversion tried to merge into branch B, but the file does not exist in branch B, so it has nowhere to merge the change. For example:

    • Create branch B
    • Change A/README
    • Delete B/README
    • Merge A -> B

    Now the change in README cannot be applied in branch B, because the file has been removed there.

    EDIT: This will result in a tree conflict in Subversion 1.6.

    0 讨论(0)
提交回复
热议问题