Mercurial > hg
comparison tests/test-rename-dir-merge.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 |
comparison
equal
deleted
inserted
replaced
| 38248:99ab72b867b7 | 38249:1e9c357d3ddf |
|---|---|
| 217 adding changesets | 217 adding changesets |
| 218 adding manifests | 218 adding manifests |
| 219 adding file changes | 219 adding file changes |
| 220 added 1 changesets with 1 changes to 1 files (+1 heads) | 220 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 221 new changesets 7d51ed18da25 | 221 new changesets 7d51ed18da25 |
| 222 1 changesets became public | 222 1 local changesets became public |
| 223 (run 'hg heads' to see heads, 'hg merge' to merge) | 223 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 224 | 224 |
| 225 $ hg merge | 225 $ hg merge |
| 226 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | 226 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 227 (branch merge, don't forget to commit) | 227 (branch merge, don't forget to commit) |