On 09-05-2010 12:47:19 +0200, Stefan Manegold wrote: > Fabian, > > Thanks for the analysis and explanations! > > One minor(?) point, though: > > So far (as far as I'm aware), we used assume an implicite order of our > branches, e.g,. Feb2010 -> Jun2010 -> default, and we used hg merge to > "propagate" (many/all) changes "from left to right", e.g., from Feb2010 to > Jun2010 or from Jun2020 to default, while we used hg transplant to > selectively "back-port" individual changes "from right to left", e.g., from > default to Jun2010 or from Jun2010 to Feb2010. > > Do you now suggest to "symmetrically" use hg transplant for both "forward > propagation" and "back-porting"?
No, but transplant is able to leave out changesets that e.g. are marked with "do not propagate", or changesets that are in fact transplants (and hence contain the same change that's already in the sources). > > % cvs transplant --log -b Jun2010 -p 456afbaaf416 -p 0ee83fdb0e97 -m > > 63f8c7be221a > ^^^ > "hg" for us that don't use your alias/script, I suppose ;-) sorry, probably should have better called my script "kwik" :) ------------------------------------------------------------------------------ _______________________________________________ Monetdb-developers mailing list Monetdb-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-developers
