Mercurial > hg
view tests/test-resolve.t @ 22071:f8fc5df6a8cf
test-patchbomb.t: work around Python change d579866d6419 (issue4188)
Python 2.7.7 and later (as well as some ubuntu/debian packages of
2.7.6) include a fix that makes the email module more pedantically
correct for MIME boundaries, but this breaks our tests. We work around
this by filtering the output of any 'hg email' invocations in the test
that produce MIME messages.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Thu, 07 Aug 2014 11:39:19 -0400 |
parents | b081decd9062 |
children | dfad19274d85 |
line wrap: on
line source
test that a commit clears the merge state. $ hg init repo $ cd repo $ echo foo > file $ hg commit -Am 'add file' adding file $ echo bar >> file $ hg commit -Am 'append bar' create a second head $ hg up -C 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo baz >> file $ hg commit -Am 'append baz' created new head failing merge $ hg merge --tool=internal:fail 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] resolve -l should contain an unresolved entry $ hg resolve -l U file resolving an unknown path emits a warning $ hg resolve -m does-not-exist arguments do not match paths that need resolving resolve the failure $ echo resolved > file $ hg resolve -m file (no more unresolved files) $ hg commit -m 'resolved' resolve -l should be empty $ hg resolve -l resolve -m should abort since no merge in progress $ hg resolve -m abort: resolve command not applicable when not merging [255] test crashed merge with empty mergestate $ mkdir .hg/merge $ touch .hg/merge/state resolve -l, should be empty $ hg resolve -l $ cd ..