Mercurial > evolve
comparison tests/test-amend.t @ 6123:5e14782908e4
tests: update for obsolescence-aware head computation in core
CORE-TEST-OUTPUT-UPDATE: f8f2ecdde4b5
CORE-TEST-OUTPUT-UPDATE: 053a5bf508da
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 27 Dec 2021 18:40:04 +0300 |
| parents | 65d4e47d7f26 |
| children | bd2c42680dff |
comparison
equal
deleted
inserted
replaced
| 6122:dbedbcf30f6b | 6123:5e14782908e4 |
|---|---|
| 216 1) create content-divergence | 216 1) create content-divergence |
| 217 2) remove divergence by pruning one of the divergent cset | 217 2) remove divergence by pruning one of the divergent cset |
| 218 $ echo edited_a > a | 218 $ echo edited_a > a |
| 219 $ hg ci -m "edited a" | 219 $ hg ci -m "edited a" |
| 220 1 new orphan changesets | 220 1 new orphan changesets |
| 221 created new head | |
| 221 $ hg debugobsolete $(hg id -ir 0 --debug) $(hg id -ir 2 --debug) | 222 $ hg debugobsolete $(hg id -ir 0 --debug) $(hg id -ir 2 --debug) |
| 222 1 new obsolescence markers | 223 1 new obsolescence markers |
| 223 2 new content-divergent changesets | 224 2 new content-divergent changesets |
| 224 | 225 |
| 225 remove divergence by pruning one side of divergenence | 226 remove divergence by pruning one side of divergenence |