Stefan Reichör <[EMAIL PROTECTED]> writes: > 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.
Could it be that he is hosting his archive on a Windows machine? I've had problems in the past when one contributor used Windows to host his archive, since the newlines were different. -- Michael Olson -- FSF Associate Member #652 -- http://www.mwolson.org/ Interests: Emacs Lisp, text markup, protocols -- Muse, Planner, ERC, EMMS /` |\ | | | IRC: mwolson on freenode.net: #hcoop, #muse, #PurdueLUG |_] | \| |_| Jabber: mwolson_at_hcoop.net
pgp1waitKlsHM.pgp
Description: PGP signature
_______________________________________________ Xtla-el-dev mailing list [email protected] https://mail.gna.org/listinfo/xtla-el-dev
