Matthieu Moy <[EMAIL PROTECTED]> writes: > Stefan Reichör wrote: >> 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] > > You get a conflict while building the revision library. This should > never happen, because only exact patching is supposed to happen there > (each changeset applies exactly to its direct ancestor revision). > > So, I can see three explanations: > > * A bug in baz caused a corrupt revision library > > * You modified your revision library manually (very unlikely since > you'd have invalidated the inode signature doing this) > > * Daniel has "changed history", i.e. uncommited a patch by "rm > -fr"-ing the corresponding patch in his archive. Which you should > _never_ do. > > Anyway, I suppose that removing your revision library entries for > Daniel (rm -fr [EMAIL PROTECTED] in your revlib) > and your cache > (~/.arch-cache/archives/[EMAIL PROTECTED]) > should solve the problem. > > The "I'll create a fresh branch" solution would also work ;-).
Good to have a person with deeper tla/baz knowledge in our team. Daniel I would like to try removing the revision library. We will see, if I can merge again from your tree then. Stefan. _______________________________________________ Xtla-el-dev mailing list [email protected] https://mail.gna.org/listinfo/xtla-el-dev
