Mercurial > hg-stable
diff tests/test-pull-update.t @ 38262:d0abd7949ea3
phases: use "published" in the phase movement message
Using "published" seems smoother than "became public" and more in line with the
"phase.publishing" configuration.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Tue, 05 Jun 2018 02:50:25 +0200 |
| parents | 1e9c357d3ddf |
| children | d7304434390f |
line wrap: on
line diff
--- a/tests/test-pull-update.t Tue Jun 05 01:49:52 2018 +0200 +++ b/tests/test-pull-update.t Tue Jun 05 02:50:25 2018 +0200 @@ -27,7 +27,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets 107cefe13e42 - 1 local changesets became public + 1 local changesets published abort: uncommitted changes [255] $ hg --config extensions.strip= strip --no-backup tip @@ -59,7 +59,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets 800c91d5bfc1 - 1 local changesets became public + 1 local changesets published 0 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to "107cefe13e42: m" 1 other heads for branch "default" @@ -82,7 +82,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (-1 heads) new changesets 483b76ad4309 - 1 local changesets became public + 1 local changesets published 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Similarity between "hg update" and "hg pull -u" in handling bookmark @@ -111,7 +111,7 @@ added 1 changesets with 1 changes to 1 files adding remote bookmark active-after-pull new changesets f815b3da6163 - 1 local changesets became public + 1 local changesets published 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (activating bookmark active-after-pull) @@ -141,7 +141,7 @@ added 1 changesets with 1 changes to 1 files adding remote bookmark active-after-pull new changesets f815b3da6163 - 1 local changesets became public + 1 local changesets published 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (activating bookmark active-after-pull) @@ -180,7 +180,7 @@ adding file changes added 2 changesets with 1 changes to 1 files new changesets f815b3da6163:b5e4babfaaa7 - 1 local changesets became public + 1 local changesets published 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark active-before-pull) @@ -208,7 +208,7 @@ adding file changes added 2 changesets with 1 changes to 1 files new changesets f815b3da6163:b5e4babfaaa7 - 1 local changesets became public + 1 local changesets published 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark active-before-pull) @@ -236,7 +236,7 @@ adding file changes added 2 changesets with 1 changes to 1 files new changesets f815b3da6163:b5e4babfaaa7 - 1 local changesets became public + 1 local changesets published 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark active-before-pull)