Show More
@@ -285,7 +285,9 b' Modify end of plain file, no EOL' | |||
|
285 | 285 | Modify end of plain file, add EOL |
|
286 | 286 | |
|
287 | 287 | $ echo >> plain |
|
288 | $ hg record -d '10 0' -m eol plain <<EOF | |
|
288 | $ echo 1 > plain2 | |
|
289 | $ hg add plain2 | |
|
290 | $ hg record -d '10 0' -m eol plain plain2 <<EOF | |
|
289 | 291 | > y |
|
290 | 292 | > y |
|
291 | 293 | > y |
@@ -300,16 +302,23 b' Modify end of plain file, add EOL' | |||
|
300 | 302 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
301 | 303 | \ No newline at end of file |
|
302 | 304 | +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
303 |
record |
|
|
305 | record change 1/3 to 'plain'? [Ynsfdaq?] | |
|
306 | diff --git a/plain2 b/plain2 | |
|
307 | new file mode 100644 | |
|
308 | examine changes to 'plain2'? [Ynsfdaq?] | |
|
304 | 309 | |
|
305 | Modify beginning, trim end, record both | |
|
310 | Modify beginning, trim end, record both, add another file to test | |
|
311 | changes numbering | |
|
306 | 312 | |
|
307 | 313 | $ rm plain |
|
308 | 314 | $ for i in 2 2 3 4 5 6 7 8 9 10; do |
|
309 | 315 | > echo $i >> plain |
|
310 | 316 | > done |
|
317 | $ echo 2 >> plain2 | |
|
311 | 318 | |
|
312 | $ hg record -d '10 0' -m begin-and-end plain <<EOF | |
|
319 | $ hg record -d '10 0' -m begin-and-end plain plain2 <<EOF | |
|
320 | > y | |
|
321 | > y | |
|
313 | 322 | > y |
|
314 | 323 | > y |
|
315 | 324 | > y |
@@ -323,23 +332,30 b' Modify beginning, trim end, record both' | |||
|
323 | 332 | 2 |
|
324 | 333 | 3 |
|
325 | 334 | 4 |
|
326 |
record change 1/ |
|
|
335 | record change 1/4 to 'plain'? [Ynsfdaq?] | |
|
327 | 336 | @@ -8,5 +8,3 @@ |
|
328 | 337 | 8 |
|
329 | 338 | 9 |
|
330 | 339 | 10 |
|
331 | 340 | -11 |
|
332 | 341 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
333 |
record change 2/ |
|
|
342 | record change 2/4 to 'plain'? [Ynsfdaq?] | |
|
343 | diff --git a/plain2 b/plain2 | |
|
344 | 1 hunks, 1 lines changed | |
|
345 | examine changes to 'plain2'? [Ynsfdaq?] | |
|
346 | @@ -1,1 +1,2 @@ | |
|
347 | 1 | |
|
348 | +2 | |
|
349 | record change 4/4 to 'plain2'? [Ynsfdaq?] | |
|
334 | 350 | |
|
335 | 351 | $ hg tip -p |
|
336 |
changeset: 11: |
|
|
352 | changeset: 11:21df83db12b8 | |
|
337 | 353 | tag: tip |
|
338 | 354 | user: test |
|
339 | 355 | date: Thu Jan 01 00:00:10 1970 +0000 |
|
340 | 356 | summary: begin-and-end |
|
341 | 357 | |
|
342 | diff -r cd07d48e8cbe -r efca65c9b09e plain | |
|
358 | diff -r ddb8b281c3ff -r 21df83db12b8 plain | |
|
343 | 359 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
|
344 | 360 | +++ b/plain Thu Jan 01 00:00:10 1970 +0000 |
|
345 | 361 | @@ -1,4 +1,4 @@ |
@@ -354,6 +370,12 b' Modify beginning, trim end, record both' | |||
|
354 | 370 | 10 |
|
355 | 371 | -11 |
|
356 | 372 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
373 | diff -r ddb8b281c3ff -r 21df83db12b8 plain2 | |
|
374 | --- a/plain2 Thu Jan 01 00:00:10 1970 +0000 | |
|
375 | +++ b/plain2 Thu Jan 01 00:00:10 1970 +0000 | |
|
376 | @@ -1,1 +1,2 @@ | |
|
377 | 1 | |
|
378 | +2 | |
|
357 | 379 | |
|
358 | 380 | |
|
359 | 381 | Trim beginning, modify end |
@@ -396,13 +418,13 b' Record end' | |||
|
396 | 418 | record change 2/2 to 'plain'? [Ynsfdaq?] |
|
397 | 419 | |
|
398 | 420 | $ hg tip -p |
|
399 |
changeset: 12:7 |
|
|
421 | changeset: 12:99337501826f | |
|
400 | 422 | tag: tip |
|
401 | 423 | user: test |
|
402 | 424 | date: Thu Jan 01 00:00:11 1970 +0000 |
|
403 | 425 | summary: end-only |
|
404 | 426 | |
|
405 | diff -r efca65c9b09e -r 7d1e66983c15 plain | |
|
427 | diff -r 21df83db12b8 -r 99337501826f plain | |
|
406 | 428 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
|
407 | 429 | +++ b/plain Thu Jan 01 00:00:11 1970 +0000 |
|
408 | 430 | @@ -7,4 +7,4 @@ |
@@ -432,13 +454,13 b' Record beginning' | |||
|
432 | 454 | record this change to 'plain'? [Ynsfdaq?] |
|
433 | 455 | |
|
434 | 456 | $ hg tip -p |
|
435 |
changeset: 13: |
|
|
457 | changeset: 13:bbd45465d540 | |
|
436 | 458 | tag: tip |
|
437 | 459 | user: test |
|
438 | 460 | date: Thu Jan 01 00:00:12 1970 +0000 |
|
439 | 461 | summary: begin-only |
|
440 | 462 | |
|
441 | diff -r 7d1e66983c15 -r a09fc62a0e61 plain | |
|
463 | diff -r 99337501826f -r bbd45465d540 plain | |
|
442 | 464 | --- a/plain Thu Jan 01 00:00:11 1970 +0000 |
|
443 | 465 | +++ b/plain Thu Jan 01 00:00:12 1970 +0000 |
|
444 | 466 | @@ -1,6 +1,3 @@ |
@@ -533,13 +555,13 b' Record beginning, middle' | |||
|
533 | 555 | record change 3/3 to 'plain'? [Ynsfdaq?] |
|
534 | 556 | |
|
535 | 557 | $ hg tip -p |
|
536 |
changeset: 15:7 |
|
|
558 | changeset: 15:f34a7937ec33 | |
|
537 | 559 | tag: tip |
|
538 | 560 | user: test |
|
539 | 561 | date: Thu Jan 01 00:00:14 1970 +0000 |
|
540 | 562 | summary: middle-only |
|
541 | 563 | |
|
542 |
diff -r c0b8 |
|
|
564 | diff -r 82c065d0b850 -r f34a7937ec33 plain | |
|
543 | 565 | --- a/plain Thu Jan 01 00:00:13 1970 +0000 |
|
544 | 566 | +++ b/plain Thu Jan 01 00:00:14 1970 +0000 |
|
545 | 567 | @@ -1,5 +1,10 @@ |
@@ -573,13 +595,13 b' Record end' | |||
|
573 | 595 | record this change to 'plain'? [Ynsfdaq?] |
|
574 | 596 | |
|
575 | 597 | $ hg tip -p |
|
576 |
changeset: 16: |
|
|
598 | changeset: 16:f9900b71a04c | |
|
577 | 599 | tag: tip |
|
578 | 600 | user: test |
|
579 | 601 | date: Thu Jan 01 00:00:15 1970 +0000 |
|
580 | 602 | summary: end-only |
|
581 | 603 | |
|
582 | diff -r 7d137997f3a6 -r 4959e3ff13eb plain | |
|
604 | diff -r f34a7937ec33 -r f9900b71a04c plain | |
|
583 | 605 | --- a/plain Thu Jan 01 00:00:14 1970 +0000 |
|
584 | 606 | +++ b/plain Thu Jan 01 00:00:15 1970 +0000 |
|
585 | 607 | @@ -9,3 +9,5 @@ |
@@ -610,13 +632,13 b' Record end' | |||
|
610 | 632 | record this change to 'subdir/a'? [Ynsfdaq?] |
|
611 | 633 | |
|
612 | 634 | $ hg tip -p |
|
613 |
changeset: 18: |
|
|
635 | changeset: 18:61be427a9deb | |
|
614 | 636 | tag: tip |
|
615 | 637 | user: test |
|
616 | 638 | date: Thu Jan 01 00:00:16 1970 +0000 |
|
617 | 639 | summary: subdir-change |
|
618 | 640 | |
|
619 |
diff -r |
|
|
641 | diff -r a7ffae4d61cb -r 61be427a9deb subdir/a | |
|
620 | 642 | --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
|
621 | 643 | +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
|
622 | 644 | @@ -1,1 +1,2 @@ |
@@ -709,13 +731,13 b' s, all' | |||
|
709 | 731 | examine changes to 'subdir/f2'? [Ynsfdaq?] |
|
710 | 732 | |
|
711 | 733 | $ hg tip -p |
|
712 |
changeset: 20: |
|
|
734 | changeset: 20:b3df3dda369a | |
|
713 | 735 | tag: tip |
|
714 | 736 | user: test |
|
715 | 737 | date: Thu Jan 01 00:00:18 1970 +0000 |
|
716 | 738 | summary: x |
|
717 | 739 | |
|
718 |
diff -r 2 |
|
|
740 | diff -r 6e02d6c9906d -r b3df3dda369a subdir/f2 | |
|
719 | 741 | --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000 |
|
720 | 742 | +++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000 |
|
721 | 743 | @@ -1,1 +1,2 @@ |
@@ -733,13 +755,13 b' f' | |||
|
733 | 755 | examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
734 | 756 | |
|
735 | 757 | $ hg tip -p |
|
736 |
changeset: 21: |
|
|
758 | changeset: 21:38ec577f126b | |
|
737 | 759 | tag: tip |
|
738 | 760 | user: test |
|
739 | 761 | date: Thu Jan 01 00:00:19 1970 +0000 |
|
740 | 762 | summary: y |
|
741 | 763 | |
|
742 |
diff -r |
|
|
764 | diff -r b3df3dda369a -r 38ec577f126b subdir/f1 | |
|
743 | 765 | --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000 |
|
744 | 766 | +++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000 |
|
745 | 767 | @@ -1,1 +1,2 @@ |
@@ -768,7 +790,7 b' Preserve chmod +x' | |||
|
768 | 790 | record this change to 'subdir/f1'? [Ynsfdaq?] |
|
769 | 791 | |
|
770 | 792 | $ hg tip --config diff.git=True -p |
|
771 |
changeset: 22: |
|
|
793 | changeset: 22:3261adceb075 | |
|
772 | 794 | tag: tip |
|
773 | 795 | user: test |
|
774 | 796 | date: Thu Jan 01 00:00:20 1970 +0000 |
@@ -804,7 +826,7 b' Preserve execute permission on original' | |||
|
804 | 826 | record this change to 'subdir/f1'? [Ynsfdaq?] |
|
805 | 827 | |
|
806 | 828 | $ hg tip --config diff.git=True -p |
|
807 |
changeset: 23: |
|
|
829 | changeset: 23:b429867550db | |
|
808 | 830 | tag: tip |
|
809 | 831 | user: test |
|
810 | 832 | date: Thu Jan 01 00:00:21 1970 +0000 |
@@ -842,7 +864,7 b' Preserve chmod -x' | |||
|
842 | 864 | record this change to 'subdir/f1'? [Ynsfdaq?] |
|
843 | 865 | |
|
844 | 866 | $ hg tip --config diff.git=True -p |
|
845 |
changeset: 24: |
|
|
867 | changeset: 24:0b082130c20a | |
|
846 | 868 | tag: tip |
|
847 | 869 | user: test |
|
848 | 870 | date: Thu Jan 01 00:00:22 1970 +0000 |
@@ -865,7 +887,7 b' Preserve chmod -x' | |||
|
865 | 887 | Abort early when a merge is in progress |
|
866 | 888 | |
|
867 | 889 | $ hg up 4 |
|
868 |
1 files updated, 0 files merged, |
|
|
890 | 1 files updated, 0 files merged, 6 files removed, 0 files unresolved | |
|
869 | 891 | |
|
870 | 892 | $ touch iwillmergethat |
|
871 | 893 | $ hg add iwillmergethat |
@@ -876,7 +898,7 b' Abort early when a merge is in progress' | |||
|
876 | 898 | $ hg ci -m'new head' |
|
877 | 899 | |
|
878 | 900 | $ hg up default |
|
879 |
|
|
|
901 | 6 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
880 | 902 | |
|
881 | 903 | $ hg merge thatbranch |
|
882 | 904 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -921,14 +943,14 b' Ignore win32text deprecation warning for' | |||
|
921 | 943 | record this change to 'subdir/f1'? [Ynsfdaq?] |
|
922 | 944 | |
|
923 | 945 | $ hg tip -p |
|
924 |
changeset: 26: |
|
|
946 | changeset: 26:b8306e70edc4 | |
|
925 | 947 | tag: tip |
|
926 |
parent: 24: |
|
|
948 | parent: 24:0b082130c20a | |
|
927 | 949 | user: test |
|
928 | 950 | date: Thu Jan 01 00:00:23 1970 +0000 |
|
929 | 951 | summary: w1 |
|
930 | 952 | |
|
931 |
diff -r |
|
|
953 | diff -r 0b082130c20a -r b8306e70edc4 subdir/f1 | |
|
932 | 954 | --- a/subdir/f1 Thu Jan 01 00:00:22 1970 +0000 |
|
933 | 955 | +++ b/subdir/f1 Thu Jan 01 00:00:23 1970 +0000 |
|
934 | 956 | @@ -3,3 +3,4 @@ |
General Comments 0
You need to be logged in to leave comments.
Login now