Mercurial > hg

changeset 6363:bbfebf751ac8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-imerge: test resolve subcommand
author Patrick Mezard <pmezard@gmail.com>
date Sun, 23 Mar 2008 20:37:04 +0100
parents bc3dbdb1d430
children b22b39059722
files tests/test-imerge tests/test-imerge.out
diffstat 2 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-imerge	Sun Mar 23 20:37:02 2008 +0100
+++ b/tests/test-imerge	Sun Mar 23 20:37:04 2008 +0100
@@ -33,6 +33,12 @@
 echo % next
 hg imerge next
 
+echo % resolve and unresolve
+hg imerge resolve foo
+hg -v imerge st
+hg imerge unresolve foo
+hg -v imerge st
+
 echo % merge next
 hg --traceback imerge
 
--- a/tests/test-imerge.out	Sun Mar 23 20:37:02 2008 +0100
+++ b/tests/test-imerge.out	Sun Mar 23 20:37:04 2008 +0100
@@ -15,6 +15,12 @@
 U foo (foo2)
 % next
 foo
+% resolve and unresolve
+merging e6da46716401 and 30d266f502e7
+R foo (foo2)
+all conflicts resolved
+merging e6da46716401 and 30d266f502e7
+U foo (foo2)
 % merge next
 merging foo and foo2
 all conflicts resolved