Hi Daniel! > Le 4602 Septembre 1993, Stefan Reichör a tapoté: >> Hi! > > 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 ;-)) > > Well, I merge from everybody without any conflict, I'm surprised. > > What is the conflict ?
I am also surprised. tla/baz seems to have a problem when merging from everybody. We used that working style before and had never such a severe problem. tla seems to work well only for a star shaped merging strategy (one integrator merges from the contributors). The problem with merging is the uncaught exception mentioned above. There is no way to merge from your tree. sync-tree does not work also. Stefan. _______________________________________________ Xtla-el-dev mailing list [email protected] https://mail.gna.org/listinfo/xtla-el-dev
