[PATCH 12 of 13] tests: unify test-merge9
in3xes at gmail.com
in3xes at gmail.com
Thu Aug 19 03:56:58 CDT 2010
# HG changeset patch
# User Pradeepkumar Gayam <in3xes at gmail.com>
# Date 1282091528 -19800
# Node ID 5f73c164fd857009060084574865a8a847375c14
# Parent b8c6d2352e0f1ce265e52e61fa94dfcd14956fa3
tests: unify test-merge9
diff --git a/tests/test-merge9.out b/tests/test-merge9.out
deleted file mode 100644
--- a/tests/test-merge9.out
+++ /dev/null
@@ -1,43 +0,0 @@
-adding bar
-adding foo
-adding quux1
-adding quux2
-created new head
-merging bar
-merging bar failed!
-merging foo and baz to baz
-1 files updated, 1 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
-U bar
-R baz
-3 files updated, 0 files merged, 1 files removed, 0 files unresolved
-merging bar
-merging bar failed!
-merging baz and foo to baz
-1 files updated, 1 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
-% show unresolved
-U bar
-R baz
-% unmark baz
-% show
-U bar
-U baz
-M bar
-M baz
-M quux2
-? bar.orig
-% re-resolve baz
-merging baz and foo to baz
-% after
-U bar
-R baz
-% resolve all warning
-abort: no files or directories specified; use --all to remerge all files
-% resolve all
-merging bar
-warning: conflicts during merge.
-merging bar failed!
-% after
-U bar
-R baz
diff --git a/tests/test-merge9 b/tests/test-merge9.t
old mode 100755
new mode 100644
rename from tests/test-merge9
rename to tests/test-merge9.t
--- a/tests/test-merge9
+++ b/tests/test-merge9.t
@@ -1,57 +1,90 @@
-#!/bin/sh
+test that we don't interrupt the merge session if
+a file-level merge failed
-# test that we don't interrupt the merge session if
-# a file-level merge failed
+ $ hg init repo
+ $ cd repo
-hg init repo
-cd repo
+ $ echo foo > foo
+ $ echo a > bar
+ $ hg ci -Am 'add foo'
+ adding bar
+ adding foo
-echo foo > foo
-echo a > bar
-hg ci -Am 'add foo'
+ $ hg mv foo baz
+ $ echo b >> bar
+ $ echo quux > quux1
+ $ hg ci -Am 'mv foo baz'
+ adding quux1
-hg mv foo baz
-echo b >> bar
-echo quux > quux1
-hg ci -Am 'mv foo baz'
+ $ hg up -qC 0
+ $ echo >> foo
+ $ echo c >> bar
+ $ echo quux > quux2
+ $ hg ci -Am 'change foo'
+ adding quux2
+ created new head
-hg up -qC 0
-echo >> foo
-echo c >> bar
-echo quux > quux2
-hg ci -Am 'change foo'
+test with the rename on the remote side
+ $ HGMERGE=false hg merge
+ merging bar
+ merging bar failed!
+ merging foo and baz to baz
+ 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
+ use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
+ $ hg resolve -l
+ U bar
+ R baz
-# test with the rename on the remote side
-HGMERGE=false hg merge
-hg resolve -l
+test with the rename on the local side
+ $ hg up -C 1
+ 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ HGMERGE=false hg merge
+ merging bar
+ merging bar failed!
+ merging baz and foo to baz
+ 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
+ use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
-# test with the rename on the local side
-hg up -C 1
-HGMERGE=false hg merge
+show unresolved
+ $ hg resolve -l
+ U bar
+ R baz
-echo % show unresolved
-hg resolve -l
+unmark baz
+ $ hg resolve -u baz
-echo % unmark baz
-hg resolve -u baz
+show
+ $ hg resolve -l
+ U bar
+ U baz
+ $ hg st
+ M bar
+ M baz
+ M quux2
+ ? bar.orig
-echo % show
-hg resolve -l
-hg st
+re-resolve baz
+ $ hg resolve baz
+ merging baz and foo to baz
-echo % re-resolve baz
-hg resolve baz
+after resolve
+ $ hg resolve -l
+ U bar
+ R baz
-echo % after
-hg resolve -l
+resolve all warning
+ $ hg resolve
+ abort: no files or directories specified; use --all to remerge all files
-echo % resolve all warning
-hg resolve
+resolve all
+ $ hg resolve -a
+ merging bar
+ warning: conflicts during merge.
+ merging bar failed!
-echo % resolve all
-hg resolve -a
+after
+ $ hg resolve -l
+ U bar
+ R baz
-echo % after
-hg resolve -l
-
-true
+ $ true
More information about the Mercurial-devel
mailing list