Hi all, <br><br>I'm sorry if this has been dealt with previously, but I could not find help about this<br>in the mailing list or on the web site.<br><br>I'm trying to merge two unrelated branches, <br>which have quite a number of directories in common.
<br><br>The problem is that if I do something like<br>$ bzr merge -r 0..-1 ../other_branch/<br><br>I get quite a number of conflicts (see them at the end if you're interested)<br><br>BEFORE I do it, my root-folders look like this:
<br>build<br>
module-libraries<br>
module-library-jar<br>
modules<br>
unittest<br>
web-root<br>
<br>AFTER my root-folders look like this:<br>build<br>build.moved<br>module-libraries<br>module-libraries.moved<br>module-library-jar<br>module-library-jar.moved<br>modules<br>unittest<br>web-root<br>web-root.moved<br><br>
and that is just the root.<br>I then have to manually merge the directories.<br>Isn't there a easier way to do this?<br>(Even if I have to do some hacking.)<br>Maybe I can add an option which will in stead of<br>moving this branch's folders to .moved,
<br>rather move the other branch's file's into this branch's folders.<br>i.e:<br>branch1/a/f1<br>branch1/a/f2<br>+<br>branch2/a/f2<br>
branch2/a/f3<br> =<br>branch1/a/f1<br>
branch1/a/f2.THIS<br>
branch1/a/f2.BASE<br>
branch1/a/f2.OTHER<br>branch1/a/f3<br><br>NOT:<br><br>
branch1/a.moved/f1<br>
branch1/a.moved/f2<br>branch1/a/f2<br>
branch1/a/f3<br><br>I also tried John's merge-into, but it didn't really work for me, <br>for one I cant specify the branch root as the SUBDIR.<br><br>I hope you can help me and that there is a easy answer.<br><br>
regards<br>marius<br><br><br><br>--<br>$ bzr merge -r 0..-1 ../other_branch/<br>+N .bzrignore<br>+N build/<br>+N build/build.xml<br>+N module-libraries/<br>+N module-libraries/TextModuleLibrary.xml<br>+N module-libraries/TextModuleLibraryUnitTests.xml
<br>+N module-library-jar/<br>+N module-library-jar/classes/<br>+N module-library-jar/src/<br>+N module-library-jar/src/za/<br>+N module-library-jar/src/za/co/<br>+N module-library-jar/src/za/co/enerweb/<br>+N module-library-jar/src/za/co/enerweb/enerbench/
<br>+N module-library-jar/src/za/co/enerweb/enerbench/complex_property/<br>+N module-library-jar/src/za/co/enerweb/enerbench/complex_property/editor/<br>+N module-library-jar/src/za/co/enerweb/enerbench/complex_property/editor/text/
<br>+N module-library-jar/src/za/co/enerweb/enerbench/complex_property/editor/text/TextTemplateEditor.java<br>+N module-library-jar/src/za/co/enerweb/enerbench/complex_property/editor/text/TextTemplatePropertyEditor.java
<br>+N module-library-jar/src/za/co/enerweb/enerbench/complex_property/type/<br>+N module-library-jar/src/za/co/enerweb/enerbench/complex_property/type/text/<br>+N module-library-jar/src/za/co/enerweb/enerbench/complex_property/type/text/TextTemplate.java
<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/GetStringArrayElementModule.java
<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/RegularExpressionMatchModule.java<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/RegularExpressionModule.java<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/RegularExpressionReplaceModule.java
<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/RegularExpressionSplitModule.java<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/RelationalConditionModule.java<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/SimpleStringModule.java
<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/StringModule.java<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/StringModule2.java<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/TextOrderModule.java
<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/conversions/<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/conversions/ByteArrayToStringModule.java<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/conversions/String2ByteArrayModule.java
<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/generator/<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/generator/GloballyUniqueIDentifierGeneratorModule.java<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/string/regex_quickref.html
<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/text/<br>+N module-library-jar/src/za/co/enerweb/enerbench/modules/text/TextTemplateModule.java<br>+N unittest/<br>+N unittest/classes/<br>+N unittest/src/
<br>+N web-root/<br>+N web-root/WEB-INF/<br>+N web-root/WEB-INF/classes/<br>+N web-root/WEB-INF/lib/<br>+N web-root/WEB-INF/src/<br>+N web-root/WEB-INF/web.xml<br>+N web-root/css/<br>+N web-root/html/<br>+N web-root/html/module_help/
<br>+N web-root/img/<br>+N web-root/img/add.png<br>+N web-root/img/boolean.png<br>+N web-root/img/constant.png<br>+N web-root/img/decrease_granularity.png<br>+N web-root/img/default.png<br>+N web-root/img/delete_medium.png
<br>+N web-root/img/divide.png<br>+N web-root/img/filter.png<br>+N web-root/img/increase_granuality.png<br>+N web-root/img/move.png<br>+N web-root/img/multiply.png<br>+N web-root/img/power.png<br>+N web-root/img/random.png
<br>+N web-root/img/round.png<br>+N web-root/img/subtract.png<br>+N web-root/img/text.png<br>+N web-root/img/text_relation.png<br>+N web-root/img/za.co.enerweb.krugepj.timeseries.filter.FilterBooleanLeaf.png<br>+N web-root/img/za.co.enerweb.krugepj.timeseries.filter.FilterLogicalOperationBranch.png
<br>+N web-root/img/za.co.enerweb.krugepj.timeseries.filter.FilterOnDayInYearLeaf.png<br>+N web-root/img/za.co.enerweb.krugepj.timeseries.filter.FilterOnDayOfWeekLeaf.png<br>+N web-root/img/za.co.enerweb.krugepj.timeseries.filter.FilterOnValueLeaf.png
<br>+N web-root/js/<br>R .bzrignore => .bzrignore.moved<br>R build/ => build.moved/<br>R module-libraries/ => module-libraries.moved/<br>R module-library-jar/ => module-library-jar.moved/<br>R unittest/ =>
unittest.moved/<br>R web-root/ => web-root.moved/<br>Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved.<br>Conflict adding file build. Moved existing file to build.moved.<br>Conflict adding file module-libraries. Moved existing file to
module-libraries.moved.<br>Conflict adding file module-library-jar. Moved existing file to module-library-jar.moved.<br>Conflict adding file unittest. Moved existing file to unittest.moved.<br>Conflict adding file web-root. Moved existing file to
web-root.moved.<br>6 conflicts encountered.<br><br><br><br>-- <br><a href="http://bazaar-vcs.org">bazaar-vcs.org</a><br>Because I don't trust Version Control Systems with less than 6953 unit tests.