Mercurial > evolve
changeset 6920:df546ef8d75f mercurial-5.0
test-compat: merge mercurial-5.1 into mercurial-5.0
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 25 Oct 2024 18:11:50 +0400 |
| parents | cde3f4bc3075 (diff) 6859ed744625 (current diff) |
| children | 4b843ae726de |
| files | .gitlab-ci.yml |
| diffstat | 23 files changed, 178 insertions(+), 414 deletions(-) [+] |
line wrap: on
line diff
--- a/.gitlab-ci.yml Fri Oct 25 17:55:54 2024 +0400 +++ b/.gitlab-ci.yml Fri Oct 25 18:11:50 2024 +0400 @@ -38,12 +38,6 @@ RUNTEST_ARGS: "--test-list /tmp/check-tests.txt --blacklist /tmp/compat-blacklist.txt" CI_CLEVER_CLOUD_FLAVOR: S -checks-py3: - <<: *runtests - variables: - RUNTEST_ARGS: "--test-list /tmp/check-tests.txt --blacklist /tmp/compat-blacklist.txt" - CI_CLEVER_CLOUD_FLAVOR: S - tests-py2-cext: <<: *runtests variables: @@ -59,42 +53,3 @@ PYTHON: prlimit --nofile=1024:1024 python2 RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt --blacklist /tmp/compat-blacklist.txt" TEST_HGMODULEPOLICY: "py" - -tests-py3-cext: - <<: *runtests - variables: - RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --blacklist /tmp/compat-blacklist.txt" - TEST_HGMODULEPOLICY: "c" - -tests-py3-pure: - <<: *runtests - variables: - RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt --blacklist /tmp/compat-blacklist.txt" - TEST_HGMODULEPOLICY: "py" - -.windows_runtests_template: &windows_runtests - before_script: - - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && ls -1 tests/test-check-*.t > C:/Temp/check-tests.txt' - script: - - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && tests/testlib/update-hg-repo.sh C:/Temp/hg' - - > - C:/MinGW/msys/1.0/bin/sh.exe --login -c ' - cd "$OLDPWD" && - evo_branch=$(hg identify --branch) && - hg_branch=${HG_BRANCH:-$(tests/testlib/map-hg-rev.sh "$evo_branch")} && - hg -R C:/Temp/hg update "$hg_branch" && - hg_rev=$(hg log -R C:/Temp/hg -r . -T "\{node\}") && - echo testing with mercurial branch="$hg_branch", revision="$hg_rev"' - - Invoke-Expression "$Env:PYTHON --version" - - echo "$Env:RUNTEST_ARGS" - - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && HGMODULEPOLICY="$TEST_HGMODULEPOLICY" $PYTHON C:/Temp/hg/tests/run-tests.py --color=always $RUNTEST_ARGS' - -windows-py3: - <<: *windows_runtests - tags: - - windows - variables: - PYTHON: py -3 - RUNTEST_ARGS: "--blacklist C:/Temp/check-tests.txt" - TEST_HGMODULEPOLICY: "c" - when: manual
--- a/tests/test-discovery-obshashrange.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-discovery-obshashrange.t Fri Oct 25 18:11:50 2024 +0400 @@ -1103,7 +1103,7 @@ stable-range cache: unable to load, regenerating obshashrange cache: unable to load, regenerating updating the branch cache - invalid branch cache (served): tip differs + invalid branchheads cache (served): tip differs $ f -s .hg/cache/evoext* .hg/cache/evoext-depthcache-00: size=96 .hg/cache/evoext-firstmerge-00: size=96
--- a/tests/test-evolve-abort-orphan.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-evolve-abort-orphan.t Fri Oct 25 18:11:50 2024 +0400 @@ -12,7 +12,6 @@ $ . $TESTDIR/testlib/common.sh -#testcases abortcommand abortflag $ cat >> $HGRCPATH <<EOF > [phases] > publish = False @@ -20,12 +19,10 @@ > evolve = > EOF -#if abortflag $ cat >> $HGRCPATH <<EOF > [alias] > abort = evolve --abort > EOF -#endif $ hg init abortrepo $ cd abortrepo @@ -49,15 +46,9 @@ Testing --abort when no evolve is interrupted ============================================= -#if abortflag $ hg evolve --abort abort: no interrupted evolve to abort [255] -#else - $ hg abort - abort: no operation in progress - [255] -#endif Testing with wrong combination of flags ======================================= @@ -111,11 +102,6 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: added c -#if abortcommand -when in dry-run mode - $ hg abort --dry-run - evolve in progress, will be aborted -#endif $ hg abort evolve aborted
--- a/tests/test-evolve-abort-phasediv.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-evolve-abort-phasediv.t Fri Oct 25 18:11:50 2024 +0400 @@ -12,7 +12,6 @@ $ . $TESTDIR/testlib/common.sh -#testcases abortcommand abortflag $ cat >> $HGRCPATH <<EOF > [phases] > publish = False @@ -20,12 +19,10 @@ > evolve = > EOF -#if abortflag $ cat >> $HGRCPATH <<EOF > [alias] > abort = evolve --abort > EOF -#endif $ hg init abortrepo $ cd abortrepo
--- a/tests/test-evolve-content-divergent-corner-cases.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-evolve-content-divergent-corner-cases.t Fri Oct 25 18:11:50 2024 +0400 @@ -376,8 +376,8 @@ base: [4] added e rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 5f6d8a4bf34a file 'd' was deleted in local but was modified in other. - You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. - What do you want to do? c + What do you want to do? + use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c 0 files updated, 1 files merged, 0 files removed, 0 files unresolved working directory is now at 8bcf0a598b0d
--- a/tests/test-evolve-continue.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-evolve-continue.t Fri Oct 25 18:11:50 2024 +0400 @@ -8,6 +8,8 @@ > [extensions] > rebase = > evolve = + > [alias] + > continue = evolve --continue > EOF Setting up the repo
--- a/tests/test-evolve-obshistory-complex.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-evolve-obshistory-complex.t Fri Oct 25 18:11:50 2024 +0400 @@ -145,30 +145,25 @@ adding B diff --git a/A b/A new file mode 100644 - examine changes to 'A'? - (enter ? for help) [Ynesfdaq?] Y + examine changes to 'A'? [Ynesfdaq?] Y @@ -0,0 +1,1 @@ +A - record change 1/2 to 'A'? - (enter ? for help) [Ynesfdaq?] Y + record change 1/2 to 'A'? [Ynesfdaq?] Y diff --git a/B b/B new file mode 100644 - examine changes to 'B'? - (enter ? for help) [Ynesfdaq?] N + examine changes to 'B'? [Ynesfdaq?] N created new head continue splitting? [Ycdq?] Y diff --git a/B b/B new file mode 100644 - examine changes to 'B'? - (enter ? for help) [Ynesfdaq?] Y + examine changes to 'B'? [Ynesfdaq?] Y @@ -0,0 +1,1 @@ +B - record this change to 'B'? - (enter ? for help) [Ynesfdaq?] Y + record this change to 'B'? [Ynesfdaq?] Y no more changes to split $ hg split --rev "desc(fold1)" -d "0 0" << EOF @@ -184,30 +179,25 @@ adding D diff --git a/C b/C new file mode 100644 - examine changes to 'C'? - (enter ? for help) [Ynesfdaq?] Y + examine changes to 'C'? [Ynesfdaq?] Y @@ -0,0 +1,1 @@ +C - record change 1/2 to 'C'? - (enter ? for help) [Ynesfdaq?] Y + record change 1/2 to 'C'? [Ynesfdaq?] Y diff --git a/D b/D new file mode 100644 - examine changes to 'D'? - (enter ? for help) [Ynesfdaq?] N + examine changes to 'D'? [Ynesfdaq?] N created new head continue splitting? [Ycdq?] Y diff --git a/D b/D new file mode 100644 - examine changes to 'D'? - (enter ? for help) [Ynesfdaq?] Y + examine changes to 'D'? [Ynesfdaq?] Y @@ -0,0 +1,1 @@ +D - record this change to 'D'? - (enter ? for help) [Ynesfdaq?] Y + record this change to 'D'? [Ynesfdaq?] Y no more changes to split 1 new orphan changesets @@ -224,30 +214,25 @@ adding F diff --git a/E b/E new file mode 100644 - examine changes to 'E'? - (enter ? for help) [Ynesfdaq?] Y + examine changes to 'E'? [Ynesfdaq?] Y @@ -0,0 +1,1 @@ +E - record change 1/2 to 'E'? - (enter ? for help) [Ynesfdaq?] Y + record change 1/2 to 'E'? [Ynesfdaq?] Y diff --git a/F b/F new file mode 100644 - examine changes to 'F'? - (enter ? for help) [Ynesfdaq?] N + examine changes to 'F'? [Ynesfdaq?] N created new head continue splitting? [Ycdq?] Y diff --git a/F b/F new file mode 100644 - examine changes to 'F'? - (enter ? for help) [Ynesfdaq?] Y + examine changes to 'F'? [Ynesfdaq?] Y @@ -0,0 +1,1 @@ +F - record this change to 'F'? - (enter ? for help) [Ynesfdaq?] Y + record this change to 'F'? [Ynesfdaq?] Y no more changes to split 1 new orphan changesets
--- a/tests/test-evolve-obshistory-lots-of-splits.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-evolve-obshistory-lots-of-splits.t Fri Oct 25 18:11:50 2024 +0400 @@ -62,77 +62,63 @@ adding d diff --git a/a b/a new file mode 100644 - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'a'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +42 - record change 1/4 to 'a'? - (enter ? for help) [Ynesfdaq?] y + record change 1/4 to 'a'? [Ynesfdaq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'b'? [Ynesfdaq?] n diff --git a/c b/c new file mode 100644 - examine changes to 'c'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'c'? [Ynesfdaq?] n diff --git a/d b/d new file mode 100644 - examine changes to 'd'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'd'? [Ynesfdaq?] n created new head continue splitting? [Ycdq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'b'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +43 - record change 1/3 to 'b'? - (enter ? for help) [Ynesfdaq?] y + record change 1/3 to 'b'? [Ynesfdaq?] y diff --git a/c b/c new file mode 100644 - examine changes to 'c'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'c'? [Ynesfdaq?] n diff --git a/d b/d new file mode 100644 - examine changes to 'd'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'd'? [Ynesfdaq?] n continue splitting? [Ycdq?] y diff --git a/c b/c new file mode 100644 - examine changes to 'c'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'c'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +44 - record change 1/2 to 'c'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to 'c'? [Ynesfdaq?] y diff --git a/d b/d new file mode 100644 - examine changes to 'd'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'd'? [Ynesfdaq?] n continue splitting? [Ycdq?] y diff --git a/d b/d new file mode 100644 - examine changes to 'd'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'd'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +45 - record this change to 'd'? - (enter ? for help) [Ynesfdaq?] y + record this change to 'd'? [Ynesfdaq?] y no more changes to split
--- a/tests/test-evolve-obshistory-split.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-evolve-obshistory-split.t Fri Oct 25 18:11:50 2024 +0400 @@ -46,30 +46,25 @@ adding b diff --git a/a b/a new file mode 100644 - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'a'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +42 - record change 1/2 to 'a'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to 'a'? [Ynesfdaq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'b'? [Ynesfdaq?] n created new head continue splitting? [Ycdq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'b'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +43 - record this change to 'b'? - (enter ? for help) [Ynesfdaq?] y + record this change to 'b'? [Ynesfdaq?] y no more changes to split
--- a/tests/test-evolve-orphan-split.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-evolve-orphan-split.t Fri Oct 25 18:11:50 2024 +0400 @@ -48,18 +48,15 @@ adding b diff --git a/a b/a new file mode 100644 - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'a'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +foo - record change 1/2 to 'a'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to 'a'? [Ynesfdaq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'b'? [Ynesfdaq?] n created new head continue splitting? [Ycdq?] c @@ -132,33 +129,27 @@ adding c diff --git a/a b/a new file mode 100644 - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'a'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +foo - record change 1/3 to 'a'? - (enter ? for help) [Ynesfdaq?] n + record change 1/3 to 'a'? [Ynesfdaq?] n diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'b'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +foo - record change 2/3 to 'b'? - (enter ? for help) [Ynesfdaq?] y + record change 2/3 to 'b'? [Ynesfdaq?] y diff --git a/c b/c new file mode 100644 - examine changes to 'c'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'c'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +foo - record change 3/3 to 'c'? - (enter ? for help) [Ynesfdaq?] y + record change 3/3 to 'c'? [Ynesfdaq?] y created new head continue splitting? [Ycdq?] c
--- a/tests/test-evolve-progress.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-evolve-progress.t Fri Oct 25 18:11:50 2024 +0400 @@ -28,6 +28,7 @@ atop:[4] first v2 hg rebase -r 4f60c78b6d58 -d fd0a2402f834 evolve: 1/3 changesets (33.33%) + searching for copies back to rev 0 resolving manifests branchmerge: True, force: True, partial: False ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 @@ -42,7 +43,10 @@ move:[2] third hg rebase -r 769574b07a96 -d 5f16d91ecde0 evolve: 2/3 changesets (66.67%) - unmatched files in other: + searching for copies back to rev 0 + unmatched files in other (from base): + b + unmatched files in other (from topological common ancestor): b resolving manifests branchmerge: True, force: True, partial: False @@ -58,6 +62,7 @@ move:[3] fourth hg rebase -r 22782fddc0ab -d 53c0008d98a0 evolve: 3/3 changesets (100.00%) + searching for copies back to rev 0 resolving manifests branchmerge: True, force: True, partial: False ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab @@ -70,7 +75,7 @@ committing changelog updating the branch cache obscache is out of date - invalid branch cache (served): tip differs + invalid branchheads cache (served): tip differs resolving manifests branchmerge: False, force: False, partial: False ancestor: 385376d04062, local: 385376d04062+, remote: fd0a2402f834 @@ -91,6 +96,7 @@ atop:[8] first v3 hg rebase -r 5f16d91ecde0 -d 152c368c622b evolve: 1/1 changesets (100.00%) + searching for copies back to rev 4 resolving manifests branchmerge: True, force: True, partial: False ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 @@ -121,6 +127,7 @@ atop:[10] first v4 hg rebase -r df5d742141b0 -d f8d7d38c0a88 evolve: 1/3 changesets (33.33%) + searching for copies back to rev 8 resolving manifests branchmerge: True, force: True, partial: False ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0 @@ -155,7 +162,10 @@ atop:[11] second hg rebase -r 53c0008d98a0 -d c8caf623f57b evolve: 2/3 changesets (66.67%) - unmatched files in other: + searching for copies back to rev 4 + unmatched files in other (from base): + b + unmatched files in other (from topological common ancestor): b resolving manifests branchmerge: True, force: True, partial: False @@ -170,6 +180,7 @@ move:[7] fourth hg rebase -r 385376d04062 -d 55f7ff45dec4 evolve: 3/3 changesets (100.00%) + searching for copies back to rev 4 resolving manifests branchmerge: True, force: True, partial: False ancestor: 53c0008d98a0, local: 55f7ff45dec4+, remote: 385376d04062 @@ -182,7 +193,7 @@ committing changelog updating the branch cache obscache is out of date - invalid branch cache (served): tip differs + invalid branchheads cache (served): tip differs resolving manifests branchmerge: False, force: False, partial: False ancestor: 1edc3bac9e3c, local: 1edc3bac9e3c+, remote: f8d7d38c0a88
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Fri Oct 25 18:11:50 2024 +0400 @@ -422,8 +422,8 @@ $ hg evolve --continue evolving 4:e568fd1029bb "added c e" file 'd' was deleted in other but was modified in local. - You can use (c)hanged version, (d)elete, or leave (u)nresolved. - What do you want to do? u + What do you want to do? + use (c)hanged version, (d)elete, or leave (u)nresolved? u 1 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted')
--- a/tests/test-evolve-templates.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-evolve-templates.t Fri Oct 25 18:11:50 2024 +0400 @@ -302,30 +302,25 @@ adding b diff --git a/a b/a new file mode 100644 - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'a'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +42 - record change 1/2 to 'a'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to 'a'? [Ynesfdaq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'b'? [Ynesfdaq?] n created new head continue splitting? [Ycdq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'b'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +43 - record this change to 'b'? - (enter ? for help) [Ynesfdaq?] y + record this change to 'b'? [Ynesfdaq?] y no more changes to split
--- a/tests/test-evolve-wdir.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-evolve-wdir.t Fri Oct 25 18:11:50 2024 +0400 @@ -141,25 +141,21 @@ adding Z diff --git a/X b/X new file mode 100644 - examine changes to 'X'? - (enter ? for help) [Ynesfdaq?] f + examine changes to 'X'? [Ynesfdaq?] f diff --git a/Y b/Y new file mode 100644 - examine changes to 'Y'? - (enter ? for help) [Ynesfdaq?] d + examine changes to 'Y'? [Ynesfdaq?] d created new head continue splitting? [Ycdq?] y diff --git a/Y b/Y new file mode 100644 - examine changes to 'Y'? - (enter ? for help) [Ynesfdaq?] f + examine changes to 'Y'? [Ynesfdaq?] f diff --git a/Z b/Z new file mode 100644 - examine changes to 'Z'? - (enter ? for help) [Ynesfdaq?] d + examine changes to 'Z'? [Ynesfdaq?] d continue splitting? [Ycdq?] c
--- a/tests/test-fixup.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-fixup.t Fri Oct 25 18:11:50 2024 +0400 @@ -10,6 +10,8 @@ > evolve = > [diff] > git = 1 + > [alias] + > continue = fixup --continue > EOF $ hg help fixup @@ -201,19 +203,6 @@ foo +update foo again -testing abort command - - $ hg fixup -r 'desc("update foo")' - merging foo - warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') - unresolved merge conflicts - (see 'hg help evolve.interrupted') - [1] - - $ hg abort - fixup aborted - working directory is now at 12b5e442244f - testing --continue flag $ hg fixup -r 'desc("update foo")'
--- a/tests/test-next-abort.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-next-abort.t Fri Oct 25 18:11:50 2024 +0400 @@ -29,8 +29,6 @@ (see 'hg help evolve.interrupted') [1] -#testcases abortcommand abortflag -#if abortflag $ hg next --abort next aborted working directory is now at 1c7f51cf0ef0 @@ -47,15 +45,5 @@ $ hg next --abort --merge abort: cannot specify both --abort and --merge [255] -#else - $ hg abort --dry-run - evolve in progress, will be aborted - $ hg abort - evolve aborted - working directory is now at 1c7f51cf0ef0 - $ hg abort - abort: no operation in progress - [255] -#endif $ cd ..
--- a/tests/test-pick.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-pick.t Fri Oct 25 18:11:50 2024 +0400 @@ -1,4 +1,4 @@ -#testcases abortcontinuecommand abortcontinueflag +#testcases abortcontinueflag Test for the pick command $ cat >> $HGRCPATH <<EOF @@ -85,22 +85,12 @@ $ hg pick --continue abort: no interrupted pick state exists [255] -#if abortcontinuecommand - $ hg continue - abort: no operation in progress - [255] -#endif Aborting without interrupted pick $ hg pick --abort abort: no interrupted pick state exists [255] -#if abortcontinuecommand - $ hg abort - abort: no operation in progress - [255] -#endif Specifying both continue and revs @@ -212,11 +202,7 @@ $ hg resolve --all --mark (no more unresolved files) continue: hg pick --continue -#if abortcontinuecommand - $ hg continue --dry-run - pick in progress, will be resumed -#endif - $ hg continue + $ hg pick --continue $ hg glog @ 8:44e155eb95c7 add c | @@ -254,7 +240,7 @@ (no more unresolved files) continue: hg pick --continue - $ hg continue + $ hg pick --continue note: picking 9:4e04628911f6 created no changes to commit Testing the abort functionality of hg pick @@ -275,11 +261,7 @@ unresolved merge conflicts (see hg help resolve) [1] -#if abortcontinuecommand - $ hg abort --dry-run - pick in progress, will be aborted -#endif - $ hg abort + $ hg pick --abort pick aborted working directory is now at c437988de89f @@ -341,7 +323,7 @@ (no more unresolved files) continue: hg pick --continue - $ hg continue + $ hg pick --continue $ hg phase -r . 11: secret @@ -512,7 +494,7 @@ $ hg resolve -t :other a (no more unresolved files) continue: hg pick --continue - $ hg continue + $ hg pick --continue Demonstrate that b was not forgotten and is definitely included in 4
--- a/tests/test-prev-next.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-prev-next.t Fri Oct 25 18:11:50 2024 +0400 @@ -484,8 +484,8 @@ [255] $ hg prev --merge --config commands.update.check=abort file 'bar' was deleted in other [destination] but was modified in local [working copy]. - You can use (c)hanged version, (d)elete, or leave (u)nresolved. - What do you want to do? + What do you want to do? + use (c)hanged version, (d)elete, or leave (u)nresolved? 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] added foo @@ -548,31 +548,26 @@ adding b diff --git a/a b/a 1 hunks, 1 lines changed - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'a'? [Ynesfdaq?] y @@ -1,1 +1,2 @@ firstline +secondline - record change 1/2 to 'a'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to 'a'? [Ynesfdaq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'b'? [Ynesfdaq?] n created new head continue splitting? [Ycdq?] Y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'b'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +bbbbb - record this change to 'b'? - (enter ? for help) [Ynesfdaq?] y + record this change to 'b'? [Ynesfdaq?] y no more changes to split 1 new orphan changesets
--- a/tests/test-rewind.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-rewind.t Fri Oct 25 18:11:50 2024 +0400 @@ -518,18 +518,15 @@ adding D diff --git a/C b/C new file mode 100644 - examine changes to 'C'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'C'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +C - record change 1/2 to 'C'? - (enter ? for help) [Ynesfdaq?] f + record change 1/2 to 'C'? [Ynesfdaq?] f diff --git a/D b/D new file mode 100644 - examine changes to 'D'? - (enter ? for help) [Ynesfdaq?] d + examine changes to 'D'? [Ynesfdaq?] d created new head continue splitting? [Ycdq?] c
--- a/tests/test-split.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-split.t Fri Oct 25 18:11:50 2024 +0400 @@ -57,35 +57,29 @@ adding _d diff --git a/_a b/_a 1 hunks, 1 lines changed - examine changes to '_a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to '_a'? [Ynesfdaq?] y @@ -1,0 +2,1 @@ +change to a - record change 1/2 to '_a'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to '_a'? [Ynesfdaq?] y diff --git a/_d b/_d new file mode 100644 - examine changes to '_d'? - (enter ? for help) [Ynesfdaq?] y + examine changes to '_d'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +_d - record change 2/2 to '_d'? - (enter ? for help) [Ynesfdaq?] n + record change 2/2 to '_d'? [Ynesfdaq?] n created new head continue splitting? [Ycdq?] Y diff --git a/_d b/_d new file mode 100644 - examine changes to '_d'? - (enter ? for help) [Ynesfdaq?] y + examine changes to '_d'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +_d - record this change to '_d'? - (enter ? for help) [Ynesfdaq?] y + record this change to '_d'? [Ynesfdaq?] y no more changes to split @@ -185,23 +179,19 @@ adding _c diff --git a/_b b/_b 1 hunks, 1 lines changed - examine changes to '_b'? - (enter ? for help) [Ynesfdaq?] y + examine changes to '_b'? [Ynesfdaq?] y @@ -1,0 +2,1 @@ +change to b - record change 1/2 to '_b'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to '_b'? [Ynesfdaq?] y diff --git a/_c b/_c new file mode 100644 - examine changes to '_c'? - (enter ? for help) [Ynesfdaq?] y + examine changes to '_c'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +_c - record change 2/2 to '_c'? - (enter ? for help) [Ynesfdaq?] n + record change 2/2 to '_c'? [Ynesfdaq?] n created new head continue splitting? [Ycdq?] c @@ -292,20 +282,17 @@ adding _d diff --git a/_a b/_a 1 hunks, 2 lines changed - examine changes to '_a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to '_a'? [Ynesfdaq?] y @@ -1,2 +1,1 @@ -_a -change to a +changetofilea - record change 1/2 to '_a'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to '_a'? [Ynesfdaq?] y diff --git a/_d b/_d new file mode 100644 - examine changes to '_d'? - (enter ? for help) [Ynesfdaq?] n + examine changes to '_d'? [Ynesfdaq?] n created new head continue splitting? [Ycdq?] c @@ -340,8 +327,7 @@ adding _d diff --git a/_d b/_d new file mode 100644 - examine changes to '_d'? - (enter ? for help) [Ynesfdaq?] abort: response expected + examine changes to '_d'? [Ynesfdaq?] abort: response expected [255] Cannot split a commit that is not a head if instability is not allowed @@ -367,8 +353,7 @@ adding _d diff --git a/_d b/_d new file mode 100644 - examine changes to '_d'? - (enter ? for help) [Ynesfdaq?] q + examine changes to '_d'? [Ynesfdaq?] q abort: user quit [255] @@ -381,8 +366,7 @@ adding _d diff --git a/_d b/_d new file mode 100644 - examine changes to '_d'? - (enter ? for help) [Ynesfdaq?] q + examine changes to '_d'? [Ynesfdaq?] q abort: user quit [255] @@ -457,18 +441,15 @@ adding celeste diff --git a/babar b/babar new file mode 100644 - examine changes to 'babar'? - (enter ? for help) [Ynesfdaq?] Y + examine changes to 'babar'? [Ynesfdaq?] Y @@ -0,0 +1,1 @@ +babar - record change 1/2 to 'babar'? - (enter ? for help) [Ynesfdaq?] Y + record change 1/2 to 'babar'? [Ynesfdaq?] Y diff --git a/celeste b/celeste new file mode 100644 - examine changes to 'celeste'? - (enter ? for help) [Ynesfdaq?] N + examine changes to 'celeste'? [Ynesfdaq?] N continue splitting? [Ycdq?] c @@ -563,19 +544,16 @@ adding SPLIT2 diff --git a/SPLIT1 b/SPLIT1 new file mode 100644 - examine changes to 'SPLIT1'? - (enter ? for help) [Ynesfdaq?] Y + examine changes to 'SPLIT1'? [Ynesfdaq?] Y diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 - examine changes to 'SPLIT2'? - (enter ? for help) [Ynesfdaq?] N + examine changes to 'SPLIT2'? [Ynesfdaq?] N continue splitting? [Ycdq?] Y diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 - examine changes to 'SPLIT2'? - (enter ? for help) [Ynesfdaq?] Y + examine changes to 'SPLIT2'? [Ynesfdaq?] Y no more changes to split @@ -644,13 +622,11 @@ adding SPLIT4 diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - examine changes to 'SPLIT3'? - (enter ? for help) [Ynesfdaq?] Y + examine changes to 'SPLIT3'? [Ynesfdaq?] Y diff --git a/SPLIT4 b/SPLIT4 new file mode 100644 - examine changes to 'SPLIT4'? - (enter ? for help) [Ynesfdaq?] q + examine changes to 'SPLIT4'? [Ynesfdaq?] q abort: user quit [255] @@ -692,13 +668,11 @@ adding SPLIT4 diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - examine changes to 'SPLIT3'? - (enter ? for help) [Ynesfdaq?] Y + examine changes to 'SPLIT3'? [Ynesfdaq?] Y diff --git a/SPLIT4 b/SPLIT4 new file mode 100644 - examine changes to 'SPLIT4'? - (enter ? for help) [Ynesfdaq?] ? + examine changes to 'SPLIT4'? [Ynesfdaq?] ? y - yes, record this change n - no, skip this change @@ -709,8 +683,7 @@ a - record all changes to all remaining files q - quit, recording no changes ? - ? (display help) - examine changes to 'SPLIT4'? - (enter ? for help) [Ynesfdaq?] d + examine changes to 'SPLIT4'? [Ynesfdaq?] d continue splitting? [Ycdq?] ? y - yes, continue selection @@ -775,13 +748,11 @@ adding SPLIT3 diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 - examine changes to 'SPLIT2'? - (enter ? for help) [Ynesfdaq?] Y + examine changes to 'SPLIT2'? [Ynesfdaq?] Y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - examine changes to 'SPLIT3'? - (enter ? for help) [Ynesfdaq?] d + examine changes to 'SPLIT3'? [Ynesfdaq?] d continue splitting? [Ycdq?] d discarding remaining changes @@ -836,15 +807,13 @@ new file mode 100644 @@ -0,0 +1,1 @@ +sp2 - record change 1/2 to 'SPLIT2'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 @@ -0,0 +1,1 @@ +sp3 - record change 2/2 to 'SPLIT3'? - (enter ? for help) [Ynesfdaq?] s + record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s continue splitting? [Ycdq?] c @@ -873,23 +842,20 @@ new file mode 100644 @@ -0,0 +1,1 @@ +sp2 - record change 1/2 to 'SPLIT2'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 @@ -0,0 +1,1 @@ +sp3 - record change 2/2 to 'SPLIT3'? - (enter ? for help) [Ynesfdaq?] s + record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s continue splitting? [Ycdq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 @@ -0,0 +1,1 @@ +sp3 - record this change to 'SPLIT3'? - (enter ? for help) [Ynesfdaq?] y + record this change to 'SPLIT3'? [Ynesfdaq?] y no more changes to split @@ -917,15 +883,13 @@ new file mode 100644 @@ -0,0 +1,1 @@ +sp2 - record change 1/2 to 'SPLIT2'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 @@ -0,0 +1,1 @@ +sp3 - record change 2/2 to 'SPLIT3'? - (enter ? for help) [Ynesfdaq?] y + record change 2/2 to 'SPLIT3'? [Ynesfdaq?] y no more changes to split $ hg status --change '.~1' @@ -952,15 +916,13 @@ new file mode 100644 @@ -0,0 +1,1 @@ +sp2 - record change 1/2 to 'SPLIT2'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 @@ -0,0 +1,1 @@ +sp3 - record change 2/2 to 'SPLIT3'? - (enter ? for help) [Ynesfdaq?] s + record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s continue splitting? [Ycdq?] d discarding remaining changes @@ -1093,31 +1055,26 @@ adding b diff --git a/a b/a new file mode 100644 - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'a'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +a - record change 1/2 to 'a'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to 'a'? [Ynesfdaq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'b'? [Ynesfdaq?] n created new head (consider using topic for lightweight branches. See 'hg help topic') continue splitting? [Ycdq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'b'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +b - record this change to 'b'? - (enter ? for help) [Ynesfdaq?] y + record this change to 'b'? [Ynesfdaq?] y no more changes to split 1 new orphan changesets @@ -1231,18 +1188,15 @@ adding c diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'b'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +b - record change 1/2 to 'b'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to 'b'? [Ynesfdaq?] y diff --git a/c b/c new file mode 100644 - examine changes to 'c'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'c'? [Ynesfdaq?] n created new head (consider using topic for lightweight branches. See 'hg help topic') @@ -1303,26 +1257,22 @@ adding c diff --git a/a b/a new file mode 100644 - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] f + examine changes to 'a'? [Ynesfdaq?] f diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] d + examine changes to 'b'? [Ynesfdaq?] d created new head (consider using topic for lightweight branches. See 'hg help topic') continue splitting? [Ycdq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] f + examine changes to 'b'? [Ynesfdaq?] f diff --git a/c b/c new file mode 100644 - examine changes to 'c'? - (enter ? for help) [Ynesfdaq?] d + examine changes to 'c'? [Ynesfdaq?] d continue splitting? [Ycdq?] d discarding remaining changes
--- a/tests/test-topic-stack-complex.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-topic-stack-complex.t Fri Oct 25 18:11:50 2024 +0400 @@ -71,18 +71,15 @@ adding d diff --git a/c b/c new file mode 100644 - examine changes to 'c'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'c'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +c - record change 1/2 to 'c'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to 'c'? [Ynesfdaq?] y diff --git a/d b/d new file mode 100644 - examine changes to 'd'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'd'? [Ynesfdaq?] n continue splitting? [Ycdq?] c 1 new orphan changesets
--- a/tests/test-topic-stack.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-topic-stack.t Fri Oct 25 18:11:50 2024 +0400 @@ -946,18 +946,15 @@ adding ggg diff --git a/Z b/Z new file mode 100644 - examine changes to 'Z'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'Z'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +zzz - record change 1/2 to 'Z'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to 'Z'? [Ynesfdaq?] y diff --git a/ggg b/ggg new file mode 100644 - examine changes to 'ggg'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'ggg'? [Ynesfdaq?] n continue splitting? [Ycdq?] c
--- a/tests/test-uncommit-interactive.t Fri Oct 25 17:55:54 2024 +0400 +++ b/tests/test-uncommit-interactive.t Fri Oct 25 18:11:50 2024 +0400 @@ -41,8 +41,7 @@ > EOF diff --git a/a b/a new file mode 100644 - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] q + examine changes to 'a'? [Ynesfdaq?] q abort: user quit [255] @@ -95,8 +94,7 @@ > EOF diff --git a/a b/a 3 hunks, 6 lines changed - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'a'? [Ynesfdaq?] y @@ -1,3 +1,6 @@ +-2 @@ -105,8 +103,7 @@ 1 2 3 - discard change 1/3 to 'a'? - (enter ? for help) [Ynesfdaq?] n + discard change 1/3 to 'a'? [Ynesfdaq?] n @@ -1,5 +4,7 @@ 1 @@ -116,15 +113,13 @@ +bar 4 5 - discard change 2/3 to 'a'? - (enter ? for help) [Ynesfdaq?] n + discard change 2/3 to 'a'? [Ynesfdaq?] n @@ -4,2 +9,3 @@ 4 5 +babar - discard change 3/3 to 'a'? - (enter ? for help) [Ynesfdaq?] n + discard change 3/3 to 'a'? [Ynesfdaq?] n abort: nothing selected to uncommit [255] @@ -141,8 +136,7 @@ > EOF diff --git a/a b/a 3 hunks, 6 lines changed - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'a'? [Ynesfdaq?] y @@ -1,3 +1,6 @@ +-2 @@ -151,8 +145,7 @@ 1 2 3 - discard change 1/3 to 'a'? - (enter ? for help) [Ynesfdaq?] y + discard change 1/3 to 'a'? [Ynesfdaq?] y @@ -1,5 +4,7 @@ 1 @@ -162,15 +155,13 @@ +bar 4 5 - discard change 2/3 to 'a'? - (enter ? for help) [Ynesfdaq?] n + discard change 2/3 to 'a'? [Ynesfdaq?] n @@ -4,2 +9,3 @@ 4 5 +babar - discard change 3/3 to 'a'? - (enter ? for help) [Ynesfdaq?] n + discard change 3/3 to 'a'? [Ynesfdaq?] n $ hg debugobsolete @@ -250,8 +241,7 @@ > EOF diff --git a/a b/a 2 hunks, 3 lines changed - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'a'? [Ynesfdaq?] y @@ -1,5 +1,7 @@ 1 @@ -261,15 +251,13 @@ +bar 4 5 - discard change 1/2 to 'a'? - (enter ? for help) [Ynesfdaq?] n + discard change 1/2 to 'a'? [Ynesfdaq?] n @@ -4,2 +6,3 @@ 4 5 +babar - discard change 2/2 to 'a'? - (enter ? for help) [Ynesfdaq?] y + discard change 2/2 to 'a'? [Ynesfdaq?] y patching file a Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). @@ -358,13 +346,11 @@ > EOF diff --git a/foo b/foo new file mode 100644 - examine changes to 'foo'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'foo'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +hey - discard this change to 'foo'? - (enter ? for help) [Ynesfdaq?] y + discard this change to 'foo'? [Ynesfdaq?] y new changeset is empty (use 'hg prune .' to remove it) @@ -427,8 +413,7 @@ > EOF diff --git a/a b/a deleted file mode 100644 - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'a'? [Ynesfdaq?] n abort: nothing selected to uncommit [255] @@ -445,8 +430,7 @@ > EOF diff --git a/a b/a deleted file mode 100644 - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'a'? [Ynesfdaq?] y new changeset is empty (use 'hg prune .' to remove it) @@ -510,24 +494,20 @@ > EOF diff --git a/foo b/foo 1 hunks, 1 lines changed - examine changes to 'foo'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'foo'? [Ynesfdaq?] y @@ -1,1 +1,2 @@ hey +foo - discard change 1/2 to 'foo'? - (enter ? for help) [Ynesfdaq?] y + discard change 1/2 to 'foo'? [Ynesfdaq?] y diff --git a/x b/x new file mode 100644 - examine changes to 'x'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'x'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +abcd - discard change 2/2 to 'x'? - (enter ? for help) [Ynesfdaq?] n + discard change 2/2 to 'x'? [Ynesfdaq?] n $ hg exp @@ -614,8 +594,7 @@ > EOF diff --git a/a b/a 3 hunks, 6 lines changed - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'a'? [Ynesfdaq?] y @@ -1,3 +1,6 @@ +-2 @@ -624,8 +603,7 @@ 1 2 3 - discard change 1/3 to 'a'? - (enter ? for help) [Ynesfdaq?] n + discard change 1/3 to 'a'? [Ynesfdaq?] n @@ -1,5 +4,7 @@ 1 @@ -635,15 +613,13 @@ +bar 4 5 - discard change 2/3 to 'a'? - (enter ? for help) [Ynesfdaq?] n + discard change 2/3 to 'a'? [Ynesfdaq?] n @@ -4,2 +9,3 @@ 4 5 +babar - discard change 3/3 to 'a'? - (enter ? for help) [Ynesfdaq?] y + discard change 3/3 to 'a'? [Ynesfdaq?] y patching file a Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines). @@ -702,8 +678,7 @@ > EOF diff --git a/a b/a 2 hunks, 5 lines changed - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'a'? [Ynesfdaq?] y @@ -1,3 +1,6 @@ +-2 @@ -712,8 +687,7 @@ 1 2 3 - discard change 1/2 to 'a'? - (enter ? for help) [Ynesfdaq?] y + discard change 1/2 to 'a'? [Ynesfdaq?] y @@ -1,5 +4,7 @@ 1 @@ -723,8 +697,7 @@ +bar 4 5 - discard change 2/2 to 'a'? - (enter ? for help) [Ynesfdaq?] n + discard change 2/2 to 'a'? [Ynesfdaq?] n $ hg exp @@ -831,8 +804,7 @@ 5 babar +celeste - discard this change to 'a'? - (enter ? for help) [Ynesfdaq?] y + discard this change to 'a'? [Ynesfdaq?] y $ hg status M a @@ -896,16 +868,14 @@ -2 -1 0 - discard change 1/2 to 'a'? - (enter ? for help) [Ynesfdaq?] y + discard change 1/2 to 'a'? [Ynesfdaq?] y @@ -9,3 +10,4 @@ 4 5 babar +celeste - discard change 2/2 to 'a'? - (enter ? for help) [Ynesfdaq?] n + discard change 2/2 to 'a'? [Ynesfdaq?] n $ hg status M a