Reintegrate a branch with externals fails in SVN

后端 未结 2 473
故里飘歌
故里飘歌 2021-02-04 08:13

What I am doing:

  1. Apply external properties to a folder in the trunk (both single file and folder external, externals are binary files)

  2. Create a

2条回答
  •  遥遥无期
    2021-02-04 09:07

    I found a work-around.

    1. Get the revision number for the branch you are going to integrate.

    2. Update to revision (using TortoiseSVN), and put the branch revision in the indicated textbox.

    3. check the box -> "Omit externals"

    Now go and re-integrate the branch to the trunk and all works.

    Note: I tried with multiple clients, SmartSVN and TortoiseSVN. They had the same error.

提交回复
热议问题