Mercurial > evolve
comparison tests/test-split.t @ 1606:c2739551ea4e mercurial-3.5
merge with stable through 3.6
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 11 Feb 2016 00:07:54 +0000 |
| parents | 2a08ef812b84 |
| children | dd6f090b7342 |
comparison
equal
deleted
inserted
replaced
| 1600:0d8973818980 | 1606:c2739551ea4e |
|---|---|
| 318 | | 318 | |
| 319 $ hg book | 319 $ hg book |
| 320 bookA 19:a2b5c9d9b362 | 320 bookA 19:a2b5c9d9b362 |
| 321 * bookB 19:a2b5c9d9b362 | 321 * bookB 19:a2b5c9d9b362 |
| 322 | 322 |
| 323 Cannot specify multiple revisions with -r | 323 Lastest revision is selected if multiple are given to -r |
| 324 $ hg split -r "desc(_a)::" | 324 $ hg split -r "desc(_a)::" |
| 325 abort: you can only specify one revision to split | 325 (leaving bookmark bookB) |
| 326 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 327 adding _d | |
| 328 diff --git a/_d b/_d | |
| 329 new file mode 100644 | |
| 330 examine changes to '_d'? [Ynesfdaq?] abort: response expected | |
| 326 [255] | 331 [255] |
| 327 | 332 |
| 328 Cannot split a commit that is not a head if instability is not allowed | 333 Cannot split a commit that is not a head if instability is not allowed |
| 329 $ cat >> $HGRCPATH <<EOF | 334 $ cat >> $HGRCPATH <<EOF |
| 330 > [experimental] | 335 > [experimental] |
| 331 > evolution=createmarkers | 336 > evolution=createmarkers |
| 332 > evolutioncommands=split | 337 > evolutioncommands=split |
| 333 > EOF | 338 > EOF |
| 339 $ hg up -qC tip | |
| 334 $ hg split -r "desc(split3)" | 340 $ hg split -r "desc(split3)" |
| 335 abort: cannot split commit: ced8fbcce3a7 not a head | 341 abort: cannot split commit: ced8fbcce3a7 not a head |
| 336 [255] | 342 [255] |
| 337 | 343 |
| 338 | 344 Changing evolution level to createmarkers |
| 345 $ echo "[experimental]" >> $HGRCPATH | |
| 346 $ echo "evolution=createmarkers" >> $HGRCPATH | |
| 347 | |
| 348 Running split without any revision operates on the parent of the working copy | |
| 349 $ hg up -qC tip | |
| 350 $ hg split << EOF | |
| 351 > q | |
| 352 > EOF | |
| 353 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 354 adding _d | |
| 355 diff --git a/_d b/_d | |
| 356 new file mode 100644 | |
| 357 examine changes to '_d'? [Ynesfdaq?] q | |
| 358 | |
| 359 abort: user quit | |
| 360 [255] | |
| 361 | |
| 362 Running split with tip revision, specified as unnamed argument | |
| 363 $ hg up -qC tip | |
| 364 $ hg split . << EOF | |
| 365 > q | |
| 366 > EOF | |
| 367 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 368 adding _d | |
| 369 diff --git a/_d b/_d | |
| 370 new file mode 100644 | |
| 371 examine changes to '_d'? [Ynesfdaq?] q | |
| 372 | |
| 373 abort: user quit | |
| 374 [255] | |
| 375 | |
| 376 Running split with both unnamed and named revision arguments shows an error msg | |
| 377 $ hg split . --rev .^ << EOF | |
| 378 > q | |
| 379 > EOF | |
| 380 abort: more than one revset is given | |
| 381 (use either `hg split <rs>` or `hg split --rev <rs>`, not both) | |
| 382 [255] | |
| 383 |