SVN Merge don't work
Question
I have a trunk and a branch. I have made some changes to branch an commit the change.
Lets say revision no is 5525.
Now I want my branch change for only this commit to be merged back to trunk.
I ran the command on trunk
svn merge --dry-run -c 5525 <url>/branch/
Nothing seems to be updated/merged. It showed me blank. Then I go on and try seeing the eligible revisions to be merged.
svn mergeinfo --show-revs eligible <url>/branch/
5525 is in there in the list, that means its eligible for merging. Whats wrong?
Please help. thanks
1 answers
solution1
0 2014-02-28 16:19:50
Run it without the --dry-run argument. This argument is only to test the merge, but doesn't do any real merging into your working copy.
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.