Mercurial > hg
view tests/test-rebase-backup.t @ 40881:8695fbe17f7c
tests: update network related errors for Debian 9
We have a CI job that runs the Mercurial tests in parallel. Some of the
network related failures seems to be different on the environment. Oddly,
those failures happens only when running the tests in parallel, not when
running the test file only.
I have no idea how to get the windows formatted message for the error, if
someone could give me an hand, I will update this changeset with the value.
Differential Revision: https://phab.mercurial-scm.org/D5401
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Mon, 10 Dec 2018 10:21:08 +0100 |
parents | 2002c193f2bc |
children | 6acbe86c6490 |
line wrap: on
line source
$ cat << EOF >> $HGRCPATH > [extensions] > rebase= > EOF ========================================== Test history-editing-backup config option | ========================================== Test with Pre-obsmarker rebase: 1) When config option is not set: $ hg init repo1 $ cd repo1 $ echo a>a $ hg ci -qAma $ echo b>b $ hg ci -qAmb $ echo c>c $ hg ci -qAmc $ hg up 0 -q $ echo d>d $ hg ci -qAmd $ echo e>e $ hg ci -qAme $ hg log -GT "{rev}: {firstline(desc)}\n" @ 4: e | o 3: d | | o 2: c | | | o 1: b |/ o 0: a $ hg rebase -s 1 -d . rebasing 1:d2ae7f538514 "b" rebasing 2:177f92b77385 "c" saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/d2ae7f538514-c7ed7a78-rebase.hg $ hg log -GT "{rev}: {firstline(desc)}\n" o 4: c | o 3: b | @ 2: e | o 1: d | o 0: a 2) When config option is set: $ cat << EOF >> $HGRCPATH > [ui] > history-editing-backup = False > EOF $ echo f>f $ hg ci -Aqmf $ echo g>g $ hg ci -Aqmg $ hg log -GT "{rev}: {firstline(desc)}\n" @ 6: g | o 5: f | | o 4: c | | | o 3: b |/ o 2: e | o 1: d | o 0: a $ hg rebase -s 3 -d . rebasing 3:05bff2a95b12 "b" rebasing 4:1762bde4404d "c" $ hg log -GT "{rev}: {firstline(desc)}\n" o 6: c | o 5: b | @ 4: g | o 3: f | o 2: e | o 1: d | o 0: a Test when rebased revisions are stripped during abort: ====================================================== $ echo conflict > c $ hg ci -Am "conflict with c" adding c created new head $ hg log -GT "{rev}: {firstline(desc)}\n" @ 7: conflict with c | | o 6: c | | | o 5: b |/ o 4: g | o 3: f | o 2: e | o 1: d | o 0: a When history-editing-backup = True: $ cat << EOF >> $HGRCPATH > [ui] > history-editing-backup = True > EOF $ hg rebase -s 5 -d . rebasing 5:1f8148a544ee "b" rebasing 6:f8bc7d28e573 "c" merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) [1] $ hg rebase --abort saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/818c1a43c916-2b644d96-backup.hg rebase aborted When history-editing-backup = False: $ cat << EOF >> $HGRCPATH > [ui] > history-editing-backup = False > EOF $ hg rebase -s 5 -d . rebasing 5:1f8148a544ee "b" rebasing 6:f8bc7d28e573 "c" merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) [1] $ hg rebase --abort rebase aborted $ cd ..