Patchwork [3,of,6] resolve: split test

login
register
mail settings
Submitter Gregory Szorc
Date May 9, 2014, 1:46 a.m.
Message ID <6d5b402aae2d697b93b1.1399599981@vm-ubuntu-main.gateway.sonic.net>
Download mbox | patch
Permalink /patch/4693/
State Accepted
Headers show

Comments

Gregory Szorc - May 9, 2014, 1:46 a.m.
# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1397870802 25200
#      Fri Apr 18 18:26:42 2014 -0700
# Node ID 6d5b402aae2d697b93b19ccf8f4d0245c4fc29d3
# Parent  30d8f8b4ad76247ebff70d88ab2bece30197bf22
resolve: split test

Part of test-resolve.t is split into multiple tests to create an
injection point for new tests that will be added in subsequent patches.

Patch

diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -25,8 +25,15 @@  failing merge
   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
+
+resolve the failure
+
   $ echo resolved > file
   $ hg resolve -m file
   $ hg commit -m 'resolved'