Mercurial > evolve
comparison tests/test-evolve-content-divergent-case-A4.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 | 03410b04cf10 |
comparison
equal
deleted
inserted
replaced
| 5646:4c1eb455259f | 5647:c2fab88e6d60 |
|---|---|
| 82 $ mkcommit D | 82 $ mkcommit D |
| 83 created new head | 83 created new head |
| 84 $ cd ../local | 84 $ cd ../local |
| 85 $ hg pull -qu | 85 $ hg pull -qu |
| 86 $ hg rebase -r 'desc(D)' -d 'desc(C)' | 86 $ hg rebase -r 'desc(D)' -d 'desc(C)' |
| 87 rebasing 4:6a418860e87b "D" (tip) | 87 rebasing 4:6a418860e87b tip "D" |
| 88 | 88 |
| 89 $ cd ../other | 89 $ cd ../other |
| 90 $ hg pull -qu | 90 $ hg pull -qu |
| 91 $ hg rebase -r 'desc(D)' -d 'desc(B)' | 91 $ hg rebase -r 'desc(D)' -d 'desc(B)' |
| 92 rebasing 4:6a418860e87b "D" (tip) | 92 rebasing 4:6a418860e87b tip "D" |
| 93 $ hg push -q | 93 $ hg push -q |
| 94 | 94 |
| 95 $ cd ../local | 95 $ cd ../local |
| 96 $ hg push -q | 96 $ hg push -q |
| 97 2 new content-divergent changesets | 97 2 new content-divergent changesets |