Mercurial > evolve
comparison tests/test-amend.t @ 5636:3f9ef377e670 mercurial-5.1
test-compat: merge mercurial-5.2 into mercurial-5.1
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 31 Oct 2020 19:10:55 +0800 |
| parents | e8542915d0f7 |
| children | 88f9bbba392d df773a9bed0c |
comparison
equal
deleted
inserted
replaced
| 5635:a34b5cf906c6 | 5636:3f9ef377e670 |
|---|---|
| 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 $ hg debugobsolete $(hg id -ir 0 --debug) $(hg id -ir 2 --debug) | 221 $ hg debugobsolete $(hg id -ir 0 --debug) $(hg id -ir 2 --debug) |
| 222 1 new obsolescence markers | |
| 223 2 new content-divergent changesets | 222 2 new content-divergent changesets |
| 224 | 223 |
| 225 remove divergence by pruning one side of divergenence | 224 remove divergence by pruning one side of divergenence |
| 226 $ hg debugobsolete $(hg id -ir 2 --debug) | 225 $ hg debugobsolete $(hg id -ir 2 --debug) |
| 227 1 new obsolescence markers | |
| 228 obsoleted 1 changesets | 226 obsoleted 1 changesets |
| 229 | 227 |
| 230 $ hg evolve -l | 228 $ hg evolve -l |
| 231 $ hg amend -m "i am gonna create divergence" | 229 $ hg amend -m "i am gonna create divergence" |
| 232 abort: amend of f8c05838af90 creates content-divergence with aafaf407b00d, from 9092f1db7931 | 230 abort: amend of f8c05838af90 creates content-divergence with aafaf407b00d, from 9092f1db7931 |