Mercurial > hg
view tests/test-histedit-merge-tools.t @ 45761:341e014fe0fb stable
repoview: only pin obsolete wdir parents while there are unresolved conflicts
I noticed after doing an update from an obsolete revision with a dirty wdir that
the obsolete commit stayed visible for no obvious reason. It was decided in
85b03b1e4715 not to clear mergestate once all of the conflicts were resolved, in
order to allow re-resolving. Since the point of pinning the obsolete parents
was to allow resolving in the first place (aaeccdb6e654), it makes sense to also
gate it on whether or not there are any remaining files to resolve. This might
result in pinning again if files are marked unresolved again, but that seems
reasonable, given that it still solves the original issue.
Note that this isn't purely cosmetic- pushing with a pinned obsolete revision is
likely to cause complaints about pushing multiple heads or other unexpected
errors. So the faster it comes out of that state, the better.
Differential Revision: https://phab.mercurial-scm.org/D9248
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 23 Oct 2020 22:20:08 -0400 |
parents | 15d2afa31e57 |
children | 5effb1992c17 |
line wrap: on
line source
Test histedit extension: Merge tools ==================================== Initialization --------------- $ . "$TESTDIR/histedit-helpers.sh" $ cat >> $HGRCPATH <<EOF > [alias] > logt = log --template '{rev}:{node|short} {desc|firstline}\n' > [extensions] > histedit= > mockmakedate = $TESTDIR/mockmakedate.py > [ui] > pre-merge-tool-output-template='pre-merge message for {node}\n' > EOF Merge conflict -------------- $ hg init r $ cd r $ echo foo > file $ hg add file $ hg ci -m "First" -d "1 0" $ echo bar > file $ hg ci -m "Second" -d "2 0" $ hg logt --graph @ 1:2aa920f62fb9 Second | o 0:7181f42b8fca First Invert the order of the commits, but fail the merge. $ hg histedit --config ui.merge=false --commands - 2>&1 <<EOF | fixbundle > pick 2aa920f62fb9 Second > pick 7181f42b8fca First > EOF merging file pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec merging file failed! Fix up the change (pick 7181f42b8fca) (hg histedit --continue to resume) $ hg histedit --abort | fixbundle 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Invert the order of the commits, and pretend the merge succeeded. $ hg histedit --config ui.merge=true --commands - 2>&1 <<EOF | fixbundle > pick 2aa920f62fb9 Second > pick 7181f42b8fca First > EOF merging file pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec 7181f42b8fca: skipping changeset (no changes)