Mercurial > hg
comparison tests/test-pull-branch.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 |
|---|---|
| 168 adding changesets | 168 adding changesets |
| 169 adding manifests | 169 adding manifests |
| 170 adding file changes | 170 adding file changes |
| 171 added 1 changesets with 1 changes to 1 files (+1 heads) | 171 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 172 new changesets 7d8ffa4c0b22 | 172 new changesets 7d8ffa4c0b22 |
| 173 13 changesets became public | 173 13 local changesets became public |
| 174 (run 'hg heads' to see heads) | 174 (run 'hg heads' to see heads) |
| 175 | 175 |
| 176 Make changes on default and branchC on tt | 176 Make changes on default and branchC on tt |
| 177 | 177 |
| 178 $ cd ../tt | 178 $ cd ../tt |
| 182 adding changesets | 182 adding changesets |
| 183 adding manifests | 183 adding manifests |
| 184 adding file changes | 184 adding file changes |
| 185 added 1 changesets with 1 changes to 1 files (+1 heads) | 185 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 186 new changesets 2b94b54b6b5f | 186 new changesets 2b94b54b6b5f |
| 187 1 changesets became public | 187 1 local changesets became public |
| 188 (run 'hg heads' to see heads) | 188 (run 'hg heads' to see heads) |
| 189 $ hg up -C default | 189 $ hg up -C default |
| 190 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 190 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 191 $ echo a1 > bar1 | 191 $ echo a1 > bar1 |
| 192 $ hg ci -Am "commit on default on tt" | 192 $ hg ci -Am "commit on default on tt" |
| 219 adding changesets | 219 adding changesets |
| 220 adding manifests | 220 adding manifests |
| 221 adding file changes | 221 adding file changes |
| 222 added 2 changesets with 2 changes to 2 files (+2 heads) | 222 added 2 changesets with 2 changes to 2 files (+2 heads) |
| 223 new changesets eed40c14b407:e634733b0309 | 223 new changesets eed40c14b407:e634733b0309 |
| 224 1 changesets became public | 224 1 local changesets became public |
| 225 (run 'hg heads .' to see heads, 'hg merge' to merge) | 225 (run 'hg heads .' to see heads, 'hg merge' to merge) |
| 226 | 226 |
| 227 $ cd .. | 227 $ cd .. |