Mercurial > evolve
diff tests/test-prune.t @ 4613:30a544904238
messages: standardize on "working copy is now at" including "is"
It seemed that we mostly used "is", but `hg next` and `hg prune` could
print it without the "is".
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 25 Apr 2019 15:14:21 -0700 |
parents | 0f2305921e4d |
children | 3810ca63398f b89495215c6e |
line wrap: on
line diff
--- a/tests/test-prune.t Thu Apr 25 13:58:29 2019 -0700 +++ b/tests/test-prune.t Thu Apr 25 15:14:21 2019 -0700 @@ -58,7 +58,7 @@ $ hg prune --user blah --date '1979-12-15' . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory now at 47d2a3944de8 + working directory is now at 47d2a3944de8 1 changesets pruned $ hg bookmark * BABAR 3:47d2a3944de8 @@ -81,7 +81,7 @@ $ hg prune 2: --color debug [ ui.status|0 files updated, 0 files merged, 3 files removed, 0 files unresolved] - [ ui.status|working directory now at [evolve.node|1f0dee641bb7]] + [ ui.status|working directory is now at [evolve.node|1f0dee641bb7]] [ ui.status|2 changesets pruned] $ hg debugobsolete 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} @@ -142,7 +142,7 @@ 4 files updated, 0 files merged, 4 files removed, 0 files unresolved $ hg prune 'desc("add ee")' -s 'desc("add nE")' 4 files updated, 0 files merged, 4 files removed, 0 files unresolved - working directory now at 6e8148413dd5 + working directory is now at 6e8148413dd5 1 changesets pruned $ hg debugobsolete 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} @@ -239,7 +239,7 @@ $ hg prune 'desc("add n1")::desc("add n2")' -s 'desc("add nD")::desc("add nE")' --pair 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - working directory now at 1f0dee641bb7 + working directory is now at 1f0dee641bb7 2 changesets pruned $ hg debugobsolete 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} @@ -262,7 +262,7 @@ $ mkcommit n2 $ hg --config extensions.strip= --config experimental.prunestrip=True strip -r . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - working directory now at c7e58696a948 + working directory is now at c7e58696a948 1 changesets pruned $ hg --config extensions.strip= --config experimental.prunestrip=True strip -r . --bundle 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -308,7 +308,7 @@ $ hg prune -B todelete 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark todelete) - working directory now at d62d843c9a01 + working directory is now at d62d843c9a01 bookmark 'todelete' deleted 1 changesets pruned $ hg id -ir dcbb326fdec2