Hi! I can no longer merge easily from Daniel:
* from revision library (linking): [EMAIL PROTECTED]/dvc--asgardr--0--patch-48 * Applying 2 revisions: .**************************************************** 1 conflicted items in this tree. Please resolve each conflict with baz "resolved 'filename'" **************************************************** baz: uncaught exception: -1:(conflict applying patch in arch_build_revision) please report this as a bug to [EMAIL PROTECTED] The only way to sync with his tree was baz replay and fixing a bunch of conflicts for every replayed version. That was doable, but much work. I am not sure, what we can do to make merging from daniel work again. (Besides switching to bzr ;-)) Stefan. _______________________________________________ Xtla-el-dev mailing list [email protected] https://mail.gna.org/listinfo/xtla-el-dev
