Mercurial > hg
diff tests/test-mq-strip.t @ 12376:97ffc68f71d3
tests: add glob matching for unified tests
This adds a " (glob)" marker that works like a simpler version of
(re): "*" is converted to ".*", and "?" is converted to ".".
Both special characters can be escaped using "\", and the backslash
itself can be escaped as well.
Other glob-style syntax, like "**", "[chars]", or "[!chars]", isn't
supported.
author | Brodie Rao <brodie@bitheap.org> |
---|---|
date | Wed, 22 Sep 2010 16:06:02 -0500 |
parents | 02990e22150b |
children | 6cc4b14fb76b |
line wrap: on
line diff
--- a/tests/test-mq-strip.t Wed Sep 22 16:06:00 2010 -0500 +++ b/tests/test-mq-strip.t Wed Sep 22 16:06:02 2010 -0500 @@ -77,7 +77,7 @@ summary: e 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - saved backup bundle to .* (re) + saved backup bundle to * (glob) % after update 4, strip 4 changeset: 3:65bd5f99a4a3 tag: tip @@ -96,7 +96,7 @@ summary: e 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - saved backup bundle to .* (re) + saved backup bundle to * (glob) % after update 4, strip 3 changeset: 1:ef3a871183d7 user: test @@ -111,7 +111,7 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: b - saved backup bundle to .* (re) + saved backup bundle to * (glob) % after update 1, strip 4 changeset: 1:ef3a871183d7 user: test @@ -127,7 +127,7 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: e - saved backup bundle to .* (re) + saved backup bundle to * (glob) % after update 4, strip 2 changeset: 3:443431ffac4f tag: tip @@ -146,7 +146,7 @@ summary: c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - saved backup bundle to .* (re) + saved backup bundle to * (glob) % after update 4, strip 1 changeset: 0:9ab35a2d17cb tag: tip @@ -157,7 +157,7 @@ $ teststrip null 4 0 files updated, 0 files merged, 1 files removed, 0 files unresolved % before update null, strip 4 - saved backup bundle to .* (re) + saved backup bundle to * (glob) % after update null, strip 4 $ hg log @@ -212,7 +212,7 @@ $ hg strip 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - saved backup bundle to .* (re) + saved backup bundle to * (glob) after strip of merge parent @@ -258,7 +258,7 @@ 2 is parent of 3, only one strip should happen $ hg strip 2 3 - saved backup bundle to .* (re) + saved backup bundle to * (glob) $ hg glog @ changeset: 2:264128213d29 | tag: tip @@ -310,8 +310,8 @@ $ hg strip 2 4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - saved backup bundle to .* (re) - saved backup bundle to .* (re) + saved backup bundle to * (glob) + saved backup bundle to * (glob) $ hg glog @ changeset: 2:65bd5f99a4a3 | tag: tip @@ -335,14 +335,14 @@ $ hg strip 1 2 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - saved backup bundle to .* (re) + saved backup bundle to * (glob) $ restore remove branchy history for qimport tests $ hg strip 3 - saved backup bundle to .* (re) + saved backup bundle to * (glob) strip of applied mq should cleanup status file @@ -364,7 +364,7 @@ $ hg strip 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - saved backup bundle to .* (re) + saved backup bundle to * (glob) applied patches after stripping rev in queue @@ -375,7 +375,7 @@ $ hg strip 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - saved backup bundle to .* (re) + saved backup bundle to * (glob) applied patches after stripping ancestor of queue