Mercurial > evolve
comparison tests/test-evolve-content-divergent-interrupted.t @ 5647:c2fab88e6d60
tests: rebase now produces different "one-line summary" output
CORE-TEST-OUTPUT-UPDATE: e9555305c5c6
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 29 Oct 2020 09:19:37 -0700 |
| parents | d7d954b6d518 |
| children | e5d91fd1f319 |
comparison
equal
deleted
inserted
replaced
| 5646:4c1eb455259f | 5647:c2fab88e6d60 |
|---|---|
| 272 | () draft | 272 | () draft |
| 273 o 0:8fa14d15e168 added hgignore | 273 o 0:8fa14d15e168 added hgignore |
| 274 () draft | 274 () draft |
| 275 | 275 |
| 276 $ hg rebase -r . -d .^^^ --config extensions.rebase= | 276 $ hg rebase -r . -d .^^^ --config extensions.rebase= |
| 277 rebasing 4:c41c793e0ef1 "added d" (tip) | 277 rebasing 4:c41c793e0ef1 tip "added d" |
| 278 $ echo bar > c | 278 $ echo bar > c |
| 279 $ hg add c | 279 $ hg add c |
| 280 $ hg amend | 280 $ hg amend |
| 281 | 281 |
| 282 $ hg up --hidden c41c793e0ef1 | 282 $ hg up --hidden c41c793e0ef1 |
| 483 Content divergence with parent change which will result in conflicts while | 483 Content divergence with parent change which will result in conflicts while |
| 484 merging | 484 merging |
| 485 --------------------------------------------------------------------------- | 485 --------------------------------------------------------------------------- |
| 486 | 486 |
| 487 $ hg rebase -r . -d .^^^ --config extensions.rebase= | 487 $ hg rebase -r . -d .^^^ --config extensions.rebase= |
| 488 rebasing 6:9c1631e352d9 "added d" (tip) | 488 rebasing 6:9c1631e352d9 tip "added d" |
| 489 | 489 |
| 490 $ hg glog | 490 $ hg glog |
| 491 @ 7:517d4375cb72 added d | 491 @ 7:517d4375cb72 added d |
| 492 | () draft | 492 | () draft |
| 493 | * 5:e49523854bc8 added d | 493 | * 5:e49523854bc8 added d |