[Updated] D12381: tests: fix glob pattern for dynamic timer alignment
pacien (Pacien)
phabricator at mercurial-scm.org
Thu Mar 17 11:44:25 UTC 2022
Closed by commit rHGf64bbba2ee59: tests: fix glob pattern for dynamic timer alignment (authored by pacien).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D12381?vs=32652&id=32656
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D12381/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D12381
AFFECTED FILES
tests/test-merge-halt.t
tests/test-shelve.t
CHANGE DETAILS
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -976,7 +976,7 @@
Test shelve --delete
$ hg shelve --list
- default (*s ago) changes to: create conflict (glob)
+ default (*s ago) * changes to: create conflict (glob)
$ hg shelve --delete doesnotexist
abort: shelved change 'doesnotexist' not found
[10]
@@ -1209,7 +1209,7 @@
$ hg add e
$ hg ci -m e
$ hg shelve --patch
- default (*s ago) changes to: b (glob)
+ default (*s ago) * changes to: b (glob)
diff --git a/c b/c
new file mode 100644
@@ -1258,7 +1258,7 @@
e
-- shelve should not contain `c` now
$ hg shelve --patch
- default (*s ago) changes to: b (glob)
+ default (*s ago) * changes to: b (glob)
diff --git a/d b/d
new file mode 100644
@@ -1357,7 +1357,7 @@
A
B
$ hg shelve --patch
- default (*s ago) changes to: add B to foo (glob)
+ default (*s ago) * changes to: add B to foo (glob)
diff --git a/foo b/foo
--- a/foo
diff --git a/tests/test-merge-halt.t b/tests/test-merge-halt.t
--- a/tests/test-merge-halt.t
+++ b/tests/test-merge-halt.t
@@ -210,6 +210,6 @@
merge halted after failed merge (see hg resolve)
[240]
$ hg shelve --list
- default (* ago) changes to: foo (glob)
+ default (*s ago) * changes to: foo (glob)
$ hg unshelve --abort
unshelve of 'default' aborted
To: pacien, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220317/d2048d1c/attachment-0002.html>
More information about the Mercurial-patches
mailing list