[PATCH 6 of 6] test resolve -X, -I and --tool

[S. Heimberg]

# HG changeset patch
# User Simon Heimberg <simohe at besonet.ch>
# Date 1218133265 -7200
# Node ID 2e17b996fe14c0a2616ce378982642b4e6cd88a3
# Parent  2275fefc9fcd557de45a59965c8e95c7ce2f2165
test resolve -X, -I and --tool

diff -r 2275fefc9fcd -r 2e17b996fe14 tests/test-merge9
--- a/tests/test-merge9	Thu Aug 07 20:15:58 2008 +0200
+++ b/tests/test-merge9	Thu Aug 07 20:21:05 2008 +0200
@@ -44,6 +44,27 @@
 echo % after
 hg resolve -l

+hg update -C .
+
+echo % merge --tool
+hg merge --tool internal:fail
+
+echo % after
+hg resolve -l
+
+echo % resolve matching
+hg resolve -I baz -X bar
+
+echo % after
+hg resolve -l
+
+echo % resolve --tool
+hg resolve -u
+hg resolve --tool internal:other baz
+
+echo % after
+hg resolve -l
+
 echo % resolve all
 hg resolve

diff -r 2275fefc9fcd -r 2e17b996fe14 tests/test-merge9.out
--- a/tests/test-merge9.out	Thu Aug 07 20:15:58 2008 +0200
+++ b/tests/test-merge9.out	Thu Aug 07 20:21:05 2008 +0200
@@ -28,6 +28,22 @@
 % after
 U bar
 R baz
+2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+% merge --tool
+1 files updated, 0 files merged, 0 files removed, 2 files unresolved
+use 'hg resolve' to retry unresolved file merges
+% after
+U bar
+U baz
+% resolve matching
+merging baz and foo to baz
+% after
+U bar
+R baz
+% resolve --tool
+% after
+U bar
+R baz
 % resolve all
 merging bar
 warning: conflicts during merge.