[Scons-dev] Big pull requests

[anatoly techtonik]

On Tue, Mar 18, 2014 at 6:32 PM, Russel Winder <russel at winder.org.uk> wrote:

> Gary tried hard to merge PR#119 over the weekend, but did not due to the

> insanity of the resulting changeset path structure. It is clear that

> Mercurial/BitBucket cannot handle pull requests from long-lived and

> frequently merged "feature branch" clones. Unless someone knows

> something Gary and I do not – which is quite likely as we both mostly

> use Git and are only used to simple Mercurial scenarios.

>

> This leads to two possibilities:

>

> 1. I create a single changeset from all the history of changes and

> submit a new pull request.


3. Transform into MQ and try to apply them on top on current head
(basically an incremental rebase).