-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
... > There is a similar problem with the current state of affairs, where > merging two branches attempts to merge everything in .pc and doesn't > leave you in a very good state. I would imagine that merging a .pc directory could easily corrupt the state. Certainly I wouldn't expect 3-way merge of a .bzr pack repository to leave you with anything that would actually work. > >> All this may change again if we switch the importer to use looms, since >> then you can do stuff like merge the patches one-by-one up the stack >> until you get to the top, without having to deal with conflicts in .diff >> format. > > Exactly. > > I think that there may be a middle ground, if we can separate > storage from presentation to the user. I don't know how that would work > without some pretty major changes though. Maybe pursuing looms is the > correct way to go. > > Thanks, > > James > See my next thread, where I discuss loom merge, and how to handle the 3-tip problem. (You have diverged patches, *and* you're merging up from upstream.) John =:-> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Cygwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk1MMSkACgkQJdeBCYSNAAN7/QCffBhyjOcql4Z0oVmDrbFoo+cB RMUAnjoYcXuxAxH7iQ3Qh19sfVujQK4b =2WdK -----END PGP SIGNATURE----- -- ubuntu-distributed-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
