svn merge --reintegrate gets stuck
Question
I am running svn client 1.7 and server 1.8. I have a branch. I have merged the trunk into branch about once every few days. Now i'm ready to reintegrate to the trunk. I run
svn merge --reintegrate https://path/to/branch/ .
Everything goes fine at first. Things start merging. After a hundred or so files, it just stops. The svn client doesn't quit. It just stops doing anything. I wait and wait and wait... nothing.
What's going on? How can I fix this?
1 answers
solution1
0 ACCPTED 2015-01-15 04:02:42
我已经升级了客户端，似乎已经解决了问题
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.
Related Question
SVN merge reintegrate missing ranges but nothing to merge
svn merge vs reintegrate - Example wanted
svn merge --reintegrate fails on “missing ranges”
Consequences of not using --reintegrate with svn merge back to trunk
cherrypick svn merge branch to trunk, followed by later merge with --reintegrate?
What's the difference between “svn merge --reintegrate” and svn merge without reintegrate if I'd like to merge a branch onto the trunk
SVN merge reintegrate fails with error: (retrieval of mergeinfo unsupported)
How do I reintegrate a feature branch with broken merge history in SVN?
svn merge with --reintegrate complains about missing ranges but mergeinfo seems correct
Is there a way to tell when reintegrate option used with svn merge?
Related Tags