Mercurial > evolve
comparison tests/test-evolve-obshistory-complex.t @ 3106:a867d59ea97a mercurial-4.3
test-compat: revert output changes from phase renaming
We keep using the old name for the older version. test has to reflect that.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 20:04:13 +0200 |
| parents | 87b83a3e0392 |
| children | 9c9c8c1eeb93 4303a46b4167 |
comparison
equal
deleted
inserted
replaced
| 3105:f5d472b7e800 | 3106:a867d59ea97a |
|---|---|
| 66 Split commits two by two | 66 Split commits two by two |
| 67 ------------------------ | 67 ------------------------ |
| 68 | 68 |
| 69 $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0" | 69 $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0" |
| 70 2 changesets folded | 70 2 changesets folded |
| 71 4 new orphan changesets | 71 4 new unstable changesets |
| 72 $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1" | 72 $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1" |
| 73 2 changesets folded | 73 2 changesets folded |
| 74 $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" | 74 $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" |
| 75 2 changesets folded | 75 2 changesets folded |
| 76 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 76 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 78 @ changeset: 9:100cc25b765f | 78 @ changeset: 9:100cc25b765f |
| 79 | tag: tip | 79 | tag: tip |
| 80 | parent: 4:868d2e0eb19c | 80 | parent: 4:868d2e0eb19c |
| 81 | user: test | 81 | user: test |
| 82 | date: Thu Jan 01 00:00:00 1970 +0000 | 82 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 83 | instability: orphan | 83 | trouble: unstable |
| 84 | summary: fold2 | 84 | summary: fold2 |
| 85 | | 85 | |
| 86 | o changeset: 8:d15d0ffc75f6 | 86 | o changeset: 8:d15d0ffc75f6 |
| 87 | | parent: 2:c473644ee0e9 | 87 | | parent: 2:c473644ee0e9 |
| 88 | | user: test | 88 | | user: test |
| 89 | | date: Thu Jan 01 00:00:00 1970 +0000 | 89 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 90 | | instability: orphan | 90 | | trouble: unstable |
| 91 | | summary: fold1 | 91 | | summary: fold1 |
| 92 | | | 92 | | |
| 93 | | o changeset: 7:b868bc49b0a4 | 93 | | o changeset: 7:b868bc49b0a4 |
| 94 | | | parent: 0:ea207398892e | 94 | | | parent: 0:ea207398892e |
| 95 | | | user: test | 95 | | | user: test |
| 234 $ hg log -G | 234 $ hg log -G |
| 235 @ changeset: 15:d4a000f63ee9 | 235 @ changeset: 15:d4a000f63ee9 |
| 236 | tag: tip | 236 | tag: tip |
| 237 | user: test | 237 | user: test |
| 238 | date: Thu Jan 01 00:00:00 1970 +0000 | 238 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 239 | instability: orphan | 239 | trouble: unstable |
| 240 | summary: fold2 | 240 | summary: fold2 |
| 241 | | 241 | |
| 242 o changeset: 14:ec31316faa9d | 242 o changeset: 14:ec31316faa9d |
| 243 | parent: 4:868d2e0eb19c | 243 | parent: 4:868d2e0eb19c |
| 244 | user: test | 244 | user: test |
| 245 | date: Thu Jan 01 00:00:00 1970 +0000 | 245 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 246 | instability: orphan | 246 | trouble: unstable |
| 247 | summary: fold2 | 247 | summary: fold2 |
| 248 | | 248 | |
| 249 | o changeset: 13:d0f33db50670 | 249 | o changeset: 13:d0f33db50670 |
| 250 | | user: test | 250 | | user: test |
| 251 | | date: Thu Jan 01 00:00:00 1970 +0000 | 251 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 252 | | instability: orphan | 252 | | trouble: unstable |
| 253 | | summary: fold1 | 253 | | summary: fold1 |
| 254 | | | 254 | | |
| 255 | o changeset: 12:7b3290f6e0a0 | 255 | o changeset: 12:7b3290f6e0a0 |
| 256 | | parent: 2:c473644ee0e9 | 256 | | parent: 2:c473644ee0e9 |
| 257 | | user: test | 257 | | user: test |
| 258 | | date: Thu Jan 01 00:00:00 1970 +0000 | 258 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 259 | | instability: orphan | 259 | | trouble: unstable |
| 260 | | summary: fold1 | 260 | | summary: fold1 |
| 261 | | | 261 | | |
| 262 | | o changeset: 11:e036916b63ea | 262 | | o changeset: 11:e036916b63ea |
| 263 | | | user: test | 263 | | | user: test |
| 264 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 264 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 310 $ hg log -G | 310 $ hg log -G |
| 311 @ changeset: 15:d4a000f63ee9 | 311 @ changeset: 15:d4a000f63ee9 |
| 312 | tag: tip | 312 | tag: tip |
| 313 | user: test | 313 | user: test |
| 314 | date: Thu Jan 01 00:00:00 1970 +0000 | 314 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 315 | instability: orphan | 315 | trouble: unstable |
| 316 | summary: fold2 | 316 | summary: fold2 |
| 317 | | 317 | |
| 318 o changeset: 14:ec31316faa9d | 318 o changeset: 14:ec31316faa9d |
| 319 | parent: 4:868d2e0eb19c | 319 | parent: 4:868d2e0eb19c |
| 320 | user: test | 320 | user: test |
| 321 | date: Thu Jan 01 00:00:00 1970 +0000 | 321 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 322 | instability: orphan | 322 | trouble: unstable |
| 323 | summary: fold2 | 323 | summary: fold2 |
| 324 | | 324 | |
| 325 | o changeset: 12:7b3290f6e0a0 | 325 | o changeset: 12:7b3290f6e0a0 |
| 326 | | parent: 2:c473644ee0e9 | 326 | | parent: 2:c473644ee0e9 |
| 327 | | user: test | 327 | | user: test |
| 328 | | date: Thu Jan 01 00:00:00 1970 +0000 | 328 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 329 | | instability: orphan | 329 | | trouble: unstable |
| 330 | | summary: fold1 | 330 | | summary: fold1 |
| 331 | | | 331 | | |
| 332 | | o changeset: 10:19e14c8397fc | 332 | | o changeset: 10:19e14c8397fc |
| 333 | | | parent: 0:ea207398892e | 333 | | | parent: 0:ea207398892e |
| 334 | | | user: test | 334 | | | user: test |