[PATCH 7 of 8] convert: merge includerevs + preprocess features

Patrick Mézard pmezard at gmail.com
Tue Nov 29 08:32:25 CST 2011


Hello Yury,

Le 28/11/11 07:26, Yury Sulsky a écrit :
> # HG changeset patch
> # User Yury Sulsky <yury.sulsky at gmail.com>
> # Date 1322460885 18000
> # Node ID 66d1b921f15271b677b8d1fb782884e847335ca7
> # Parent  94ee4735ac3e64348ce1aa5de8265fd24dc93ccf
> # Parent  a193b88653a7483488a781b5d34dc9482330452b
> convert: merge includerevs + preprocess features

It is unnecessary to send merge revisions to the list but it tells one thing: your patch series really contains 3 independant features, with a bit of code overlapping. We are likely to review each feature separately so it is easier for us if you send 3 different patch series (many reviewers use some kind of tool to export your patches automatically into an mq, which does not work well in this case).

What could happen then is:
- The changes in each series do not conflict at diff level, the series can be pushed in any order. This is good because it means we can discuss them in any order and even decide to drop one and keep the other without additional work for you.
- After applying one series, the other do not apply cleanly. The reviewer might rebase it himself if the merge are trivial, but he is likely to ask you to rebase it yourself and resend. This is one reason to discuss the features a bit before sending, at least if they involve many changes and if they can be painful to rebase.

I will start discussing each feature separately.

Thanks for all these promising patches!

--
Patrick Mézard


More information about the Mercurial-devel mailing list