equal
deleted
inserted
replaced
334 $ cat >> $HGRCPATH <<EOF |
334 $ cat >> $HGRCPATH <<EOF |
335 > [experimental] |
335 > [experimental] |
336 > evolution=createmarkers |
336 > evolution=createmarkers |
337 > evolutioncommands=split |
337 > evolutioncommands=split |
338 > EOF |
338 > EOF |
|
339 $ hg up -qC tip |
339 $ hg split -r "desc(split3)" |
340 $ hg split -r "desc(split3)" |
340 abort: cannot split commit: ced8fbcce3a7 not a head |
341 abort: cannot split commit: ced8fbcce3a7 not a head |
341 [255] |
342 [255] |
342 |
343 |
343 Changing evolution level to createmarkers |
344 Changing evolution level to createmarkers |
344 $ echo "[experimental]" >> $HGRCPATH |
345 $ echo "[experimental]" >> $HGRCPATH |
345 $ echo "evolution=createmarkers" >> $HGRCPATH |
346 $ echo "evolution=createmarkers" >> $HGRCPATH |
346 |
347 |
347 Running split without any revision operates on the parent of the working copy |
348 Running split without any revision operates on the parent of the working copy |
|
349 $ hg up -qC tip |
348 $ hg split << EOF |
350 $ hg split << EOF |
349 > q |
351 > q |
350 > EOF |
352 > EOF |
351 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
353 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
352 adding _d |
354 adding _d |
356 |
358 |
357 abort: user quit |
359 abort: user quit |
358 [255] |
360 [255] |
359 |
361 |
360 Running split with tip revision, specified as unnamed argument |
362 Running split with tip revision, specified as unnamed argument |
|
363 $ hg up -qC tip |
361 $ hg split . << EOF |
364 $ hg split . << EOF |
362 > q |
365 > q |
363 > EOF |
366 > EOF |
364 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
367 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
365 adding _d |
368 adding _d |
375 > q |
378 > q |
376 > EOF |
379 > EOF |
377 abort: more than one revset is given |
380 abort: more than one revset is given |
378 (use either `hg split <rs>` or `hg split --rev <rs>`, not both) |
381 (use either `hg split <rs>` or `hg split --rev <rs>`, not both) |
379 [255] |
382 [255] |
|
383 $ hg revert --all |
|
384 forgetting _d |
380 |
385 |
381 Split empty commit (issue5191) |
386 Split empty commit (issue5191) |
382 $ hg branch new-branch |
387 $ hg branch new-branch |
383 marked working directory as branch new-branch |
388 marked working directory as branch new-branch |
384 (branches are permanent and global, did you want a bookmark?) |
389 (branches are permanent and global, did you want a bookmark?) |