Hi again, Petr Rockai <[email protected]> writes: > http://repos.mornfall.net/lvm2/upstream > http://repos.mornfall.net/lvm2/lvmlib > > These are darcs-2 repos that are fairly closely related (normal divergent > branches of development). The result has a dozen or so conflicts (proper > conflict markup would make resolving those much easier, btw). it also seems that the conflict resolution is completely botched in the resulting repository. Pieces of code from "upstream" are lost and there are no conflicts marked around these (look at lib/metadata/metadata.c, function _vg_make_handle in both the original branches and in the merged result).
I guess I'll have to resolve this merge by hand (ick). Yours, Petr. PS: It may be good idea to avoid replace patches in practice, wherever not-completely-trivial merges could ever happen. It seems that when a replace patch is encountered in a merge stack, it stops any useful conflict markup from ever happening. -- Peter Rockai | me()mornfall!net | prockai()redhat!com http://blog.mornfall.net | http://web.mornfall.net "In My Egotistical Opinion, most people's C programs should be indented six feet downward and covered with dirt." -- Blair P. Houghton on the subject of C program indentation _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
