Mercurial > evolve
comparison tests/test-evolve-content-divergent-case-A3.t @ 6809:9903ee44e658 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 26 Jun 2024 18:09:37 +0400 |
| parents | 1328195f76a9 |
| children |
comparison
equal
deleted
inserted
replaced
| 6808:c7d3e1d8c6f1 | 6809:9903ee44e658 |
|---|---|
| 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 tip "C" | 82 rebasing 3:928c8849ec01 "C" (tip) |
| 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 |