Mercurial > evolve
diff CHANGELOG @ 4252:a07cd1d076bb
next: solve the issue of `next` get confused by split
This patch solve a problem of next command which get confused by split.
Let me describe how it was getting confused:
Initial state of repo:
A---B---C
After splitting B to (B1,B2):
@
A---B1---B2
\
---B---C
X *
(note: C is orphan; checkedout to B1)
Lets make an amend on B1:
@
B1'
/
A---B1---B2
\ X *
\
---B---C
X *
Now, if run `hg next` (--evolve is True by default now):
$ it would give you choice to choose from B2 and C thinking that C could also
be a possbile children for B1, instead of stablizing B2 on B1.
I fixed this problem by filtering those aspiring children which can be
stablized on one of the aspiring children itself.
Changes made in test-prev-next.t shows the changed expected behaviour.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Tue, 06 Nov 2018 10:41:50 +0530 |
parents | 820a25dcea58 |
children | 35dac5aadcfc |
line wrap: on
line diff
--- a/CHANGELOG Tue Nov 06 15:10:56 2018 +0530 +++ b/CHANGELOG Tue Nov 06 10:41:50 2018 +0530 @@ -6,6 +6,7 @@ * push: have `--publish` overrule the `auto-publish` config * next: evolve aspiring children by default (use --no-evolve to skip) + * next: pick lower part of a split as destination 8.3.2 - in progress -------------------