Mercurial > evolve
comparison tests/test-evolve-content-divergent-case-A5.t @ 5892:34cd08a46b6d mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 24 Apr 2021 20:01:39 +0800 |
| parents | fd039a7f0c3c |
| children |
comparison
equal
deleted
inserted
replaced
| 5891:b13cb2d500ae | 5892:34cd08a46b6d |
|---|---|
| 71 $ mkcommit B | 71 $ mkcommit B |
| 72 $ mkcommit C | 72 $ mkcommit C |
| 73 $ cd ../local | 73 $ cd ../local |
| 74 $ hg pull -qu | 74 $ hg pull -qu |
| 75 $ hg rebase -r 'desc(C)' -d 'desc(A)' | 75 $ hg rebase -r 'desc(C)' -d 'desc(A)' |
| 76 rebasing 3:d90aa47aa5d3 tip "C" | 76 rebasing 3:d90aa47aa5d3 "C" (tip) |
| 77 | 77 |
| 78 $ cd ../other | 78 $ cd ../other |
| 79 $ hg pull -qu | 79 $ hg pull -qu |
| 80 $ hg prev | 80 $ hg prev |
| 81 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 81 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |