Older Subversion servers do not support the --reintegrate option of newer clients. This makes it necessary to do it without. In order to merge the changes from a branch into the trunk it is necessary to find the revision number when the branch has been created by a copy. This is done by the --stop-on-copy option of svn log.
$ svn log --verbose --stop-on-copy ../branches/szi ------------------------------------------------------------------------ r3501 | szi | 2014-07-08 16:14:07 +0200 (Tue, 08 Jul 2014) | 1 line Changed paths: A /java-dao/branches/szi (from /java-dao/trunk:3494) M /java-dao/branches/szi/src/dao/Condition.java M /java-dao/branches/szi/src/dao/Entity.java M /java-dao/branches/szi/src/dao/Factory.java M /java-dao/branches/szi/src/dao/Facturable.java M /java-dao/branches/szi/src/dao/Order.java M /java-dao/branches/szi/src/dao/Value.java
After that you can do the merge.
$ svn merge -r 3494:HEAD ../branches/szi --- Merging r3495 through r3581 into '.': U src/dao/Factory.java U src/dao/Facturable.java U src/dao/Order.java U src/dao/Value.java U src/dao/Entity.java U src/dao/Condition.java
Keine Kommentare:
Kommentar veröffentlichen