Mercurial > hg
diff tests/test-pull-update.t @ 38249:1e9c357d3ddf
phase: clarify the message about movement on command changeset
The current message is a bit generic. Since we only print it for phase movement
on changeset already common before the pull, we add "local" to the message in
and attempt to clarify what changeset the phase movement affected.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 05 Jun 2018 01:49:52 +0200 |
parents | eb9835014d20 |
children | d0abd7949ea3 |
line wrap: on
line diff
--- a/tests/test-pull-update.t Sun Apr 29 00:29:40 2018 -0400 +++ b/tests/test-pull-update.t Tue Jun 05 01:49:52 2018 +0200 @@ -27,7 +27,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets 107cefe13e42 - 1 changesets became public + 1 local changesets became public 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 changesets became public + 1 local changesets became public 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 changesets became public + 1 local changesets became public 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 changesets became public + 1 local changesets became public 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 changesets became public + 1 local changesets became public 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 changesets became public + 1 local changesets became public 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 changesets became public + 1 local changesets became public 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 changesets became public + 1 local changesets became public 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark active-before-pull)