Mercurial > evolve
comparison tests/test-stabilize-conflict.t @ 3001:67b59d1657cf mercurial-4.2
compat-test: merge future 6.7.0 into 4.2 compat branch
Couple feature to disable and other various test impact.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 27 Sep 2017 01:07:22 +0200 |
| parents | 2280461343e5 bd7e8be29542 |
| children | ddf28837f5af 9c9c8c1eeb93 |
comparison
equal
deleted
inserted
replaced
| 2808:f47ed78ab17b | 3001:67b59d1657cf |
|---|---|
| 159 date: Thu Jan 01 00:00:00 1970 +0000 | 159 date: Thu Jan 01 00:00:00 1970 +0000 |
| 160 summary: babar count up to five | 160 summary: babar count up to five |
| 161 | 161 |
| 162 (fix the conflict and continue) | 162 (fix the conflict and continue) |
| 163 | 163 |
| 164 $ hg revert -r 5 --all | 164 $ hg revert -r 71c18f70c34f --all |
| 165 reverting babar | 165 reverting babar |
| 166 $ safesed 's/dix/ten/' babar | 166 $ safesed 's/dix/ten/' babar |
| 167 $ hg resolve --all -m | 167 $ hg resolve --all -m |
| 168 (no more unresolved files) | 168 (no more unresolved files) |
| 169 $ hg evolve --continue | 169 $ hg evolve --continue |