The English version:
Problem description:
In our SVN version library, the test branch is part of the selective
merge development branch to test the launch (some of the requirements are
done, and temporarily not publish New version, so temporarily out of line
and test the branch test).
The test branch of the compiled server will be replicated multiple
times to the test branch of the test, which will not be submitted to the
version library for a while. When it is publish New version, it will submit
all versions of the test branch merged at the current launch of the test
branch (the local counterpart has been holding all the mergers needed for
the next launch, without submitting the)).
Sometimes merge code, false operation: do not choose the version
number that needs to merge, cause: : SVN rendezure and all unmerged code to
the local test branch!
Suggestions:
The SVN merge second step, without selecting the required merge
version: confirm("Are you sure to merge all versions?")
svn Merge Step Two 【Next】Button click, is can check specific range is
empty, show confirm("Are you sure to merge all versions?")
Thanks!
中文版:
问题描述:
我们的svn版本库中,测试分支是选择性的合并开发分支的一部分版本来测试上线(一部分需求做完了,暂时还不上线,所以暂时不合并测试分支测试)。
编译服务器检出的测试分支,会多次合并需要测试的版本至测试分支,一段时间暂时不提交至版本库。等到上线时,才会提交当前上线时测试分支合并的所有版本(本地一直存放着下次上线所需的所有合并,没有提交)。
有时候合并代码时,误操作:没有选择需要合并的版本号,导致:SVN会合并所有未合并的代码至本地测试分支!
建议:
SVN合并第二步,没有选择所需的合并版本时:confirm("您确定要合并所有版本吗?")
谢谢!
--
You received this message because you are subscribed to the Google Groups
"TortoiseSVN" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/tortoisesvn/d1dcec01-5304-4f7c-a007-6f7b8e16e056%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.