Mercurial > evolve
comparison tests/test-evolve-content-divergent-case-A3.t @ 5706:59b2be90e9fd stable
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 | 03410b04cf10 53d63b608230 |
comparison
equal
deleted
inserted
replaced
| 5691:6eb9f82b43ba | 5706:59b2be90e9fd |
|---|---|
| 77 $ mkcommit C | 77 $ mkcommit C |
| 78 created new head | 78 created new head |
| 79 $ cd ../local | 79 $ cd ../local |
| 80 $ hg pull -qu | 80 $ hg pull -qu |
| 81 $ hg rebase -r 'desc(C)' -d 'desc(B)' | 81 $ hg rebase -r 'desc(C)' -d 'desc(B)' |
| 82 rebasing 3:928c8849ec01 "C" (tip) | 82 rebasing 3:928c8849ec01 tip "C" |
| 83 | 83 |
| 84 $ cd ../other | 84 $ cd ../other |
| 85 $ hg pull -qu | 85 $ hg pull -qu |
| 86 $ echo newC > C | 86 $ echo newC > C |
| 87 $ hg amend | 87 $ hg amend |