Mercurial > hg
comparison tests/test-obsolete-divergent.t @ 18644:3e92772d5383
spelling: fix some minor issues found by spell checker
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sun, 10 Feb 2013 18:24:29 +0100 |
| parents | f3b21beb9802 |
| children | 7731a2281cf0 |
comparison
equal
deleted
inserted
replaced
| 18643:cc28a84db8c9 | 18644:3e92772d5383 |
|---|---|
| 1 Test file dedicated to testing the divergent troubles from obsolete changeset. | 1 Test file dedicated to testing the divergent troubles from obsolete changeset. |
| 2 | 2 |
| 3 This is the most complexe troubles from far so we isolate it in a dedicated | 3 This is the most complex troubles from far so we isolate it in a dedicated |
| 4 file. | 4 file. |
| 5 | 5 |
| 6 Enable obsolete | 6 Enable obsolete |
| 7 | 7 |
| 8 $ cat > obs.py << EOF | 8 $ cat > obs.py << EOF |
| 292 e442cfc57690 | 292 e442cfc57690 |
| 293 e442cfc57690 | 293 e442cfc57690 |
| 294 e442cfc57690 | 294 e442cfc57690 |
| 295 $ hg log -r 'divergent()' | 295 $ hg log -r 'divergent()' |
| 296 | 296 |
| 297 Check more complexe obsolescence graft (with divergence) | 297 Check more complex obsolescence graft (with divergence) |
| 298 | 298 |
| 299 $ mkcommit B_0; hg up 0 | 299 $ mkcommit B_0; hg up 0 |
| 300 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 300 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 301 $ hg debugobsolete `getid B_0` `getid A_2` | 301 $ hg debugobsolete `getid B_0` `getid A_2` |
| 302 $ mkcommit A_7; hg up 0 | 302 $ mkcommit A_7; hg up 0 |