[PATCH 0 of 2 STABLE] annotation: fix problems in the tree merging a revision and its ancestor

[Alexander Drozdov]

28.03.2013 15:48, FUJIWARA Katsunori wrote:
>
> As describing in each patch descriptions, issue3841 occurs only on
> repositories which include the revision merging a revision and its
> ancestor, and recent Mercurial doesn't allow such merging.
>
> So, there is no easy way to build the repository to examine validity
> of these patches.

I often use the simple script to group patch series with recent version of Mercurial:

#!/bin/sh

MASTER=$1
FEATURE=$2
ANCESTOR=`hg log -q -r $MASTER\ and\ not\ ancestor\($MASTER\,\ $FEATURE\)`

hg purge
if [ -n "$ANCESTOR" ]; then
         hg up $MASTER && hg merge -r $FEATURE
else
         hg up $MASTER && hg debugsetparents $MASTER $FEATURE && hg revert -a -r $FEATURE
fi