[improvement]【merge】Merge from foreign repository is not compatible with mergeinfo modification

56 views
Skip to first unread message

小辉辉

unread,
Oct 22, 2019, 10:52:47 PM10/22/19
to TortoiseSVN
Hello dear developers,

Merge from foreign repository is not compatible with mergeinfo modification  

Precondition: The code address of the repository checked out by the working copy is "http://127.0.0.1/SVN".
When merging the code of the "http://127.0.0.1/svn/Branches/v1.0" branch to the "Trunk/v1.0" branch, SVN considers the merge operation between different repositories, resulting in no version merge. Record the merge operation.
Note: "http://127.0.0.1/SVN" and "http://127.0.0.1/svn" are the same repository address, but the address is different in case.
Suggestion: When judging whether it is the same repository, the address is not Need to be case sensitive
thank you

中文描述:
前置条件:工作副本检出的版本库代码地址为“http://127.0.0.1/SVN”。
合并“http://127.0.0.1/svn/Branches/v1.0”分支的代码至“Trunk/v1.0”分支时,SVN认为是不同版本库之间的合并操作,导致版本合并后,没有记录合并操作。
注意:“http://127.0.0.1/SVN”和“http://127.0.0.1/svn”是同一个版本库地址,只是地址大小写不同
建议:判断是否为同一个版本库时,地址不需要区分大小写
谢谢

Stefan

unread,
Oct 23, 2019, 1:02:50 PM10/23/19
to TortoiseSVN


On Wednesday, October 23, 2019 at 4:52:47 AM UTC+2, 小辉辉 wrote:
Hello dear developers,

Merge from foreign repository is not compatible with mergeinfo modification  

Precondition: The code address of the repository checked out by the working copy is "http://127.0.0.1/SVN".
When merging the code of the "http://127.0.0.1/svn/Branches/v1.0" branch to the "Trunk/v1.0" branch, SVN considers the merge operation between different repositories, resulting in no version merge. Record the merge operation.
Note: "http://127.0.0.1/SVN" and "http://127.0.0.1/svn" are the same repository address, but the address is different in case.
Suggestion: When judging whether it is the same repository, the address is not Need to be case sensitive
thank you


Sorry, but that would be wrong.
section 2.7.3 http://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-25#page-19

The scheme and host are case-insensitive and normally provided in lowercase; all other components are compared in a case-sensitive manner.

Reply all
Reply to author
Forward
0 new messages