I have svn 1.6.11 and I am trying to merge mybranch onto the trunk. I have tried both
svn merge --reintegrate http://IP/path/to/repo/branches/mybranch http://IP/path/to/repo/trunk
svn ci -m "blah"
and
svn merge http://IP/path/to/repo/branches/mybranch http://IP/path/to/repo/trunk
svn ci -m "blah"
They both gave me after the merge:
$ svn diff
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
Merged /repo/trunk:r23
and after the commit:
Sending trunk
I do not see the changes in the trunk. When I diff the trunk version before the merge (18) to the latest version (24), I get:
$ svn diff -r 18:24
Property changes on: .
___________________________________________________________________
Added: svn:mergeinfo
Merged /repo/trunk:r20-23
I don't just want property changes. I want the code changes to be merged. What did I do wrong?
svn commit -m "etc commits"
svn merge http://IP/path/to/repo/trunk .
, testing , svn commit -m "Merged from trunk and passed tests
svn co http://IP/path/to/repo/trunk
svn merge --reintegrate http://IP/path/to/repo/branches/mybranch .
svn commit -m"My Feature Merged In"
NB The SVN documentation mentions 2 URL or server side merges - mostly to "say this is possible but difficult so don't even try it unless your really know what you are doing"
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.