equal
deleted
inserted
replaced
133 A b |
133 A b |
134 |
134 |
135 Commit with several checks |
135 Commit with several checks |
136 |
136 |
137 $ hg --debug commit -mabsym -u 'User Name <user@example.com>' |
137 $ hg --debug commit -mabsym -u 'User Name <user@example.com>' |
|
138 committing files: |
138 a |
139 a |
139 b |
140 b |
|
141 committing manifest |
|
142 committing changelog |
140 overwriting a expanding keywords |
143 overwriting a expanding keywords |
141 running hook commit.test: cp a hooktest |
144 running hook commit.test: cp a hooktest |
142 committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
145 committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
143 $ hg status |
146 $ hg status |
144 ? hooktest |
147 ? hooktest |
473 > EOF |
476 > EOF |
474 diff --git a/r b/r |
477 diff --git a/r b/r |
475 new file mode 100644 |
478 new file mode 100644 |
476 examine changes to 'r'? [Ynesfdaq?] y |
479 examine changes to 'r'? [Ynesfdaq?] y |
477 |
480 |
|
481 committing files: |
478 r |
482 r |
|
483 committing manifest |
|
484 committing changelog |
479 committed changeset 3:82a2f715724d |
485 committed changeset 3:82a2f715724d |
480 overwriting r expanding keywords |
486 overwriting r expanding keywords |
481 - status call required for dirstate.normallookup() check |
487 - status call required for dirstate.normallookup() check |
482 $ hg status r |
488 $ hg status r |
483 $ hg --verbose rollback |
489 $ hg --verbose rollback |
498 > EOF |
504 > EOF |
499 diff --git a/i b/i |
505 diff --git a/i b/i |
500 new file mode 100644 |
506 new file mode 100644 |
501 examine changes to 'i'? [Ynesfdaq?] y |
507 examine changes to 'i'? [Ynesfdaq?] y |
502 |
508 |
|
509 committing files: |
503 i |
510 i |
|
511 committing manifest |
|
512 committing changelog |
504 committed changeset 3:9f40ceb5a072 |
513 committed changeset 3:9f40ceb5a072 |
505 $ cat i |
514 $ cat i |
506 $Id$ |
515 $Id$ |
507 $ hg -q rollback |
516 $ hg -q rollback |
508 $ hg forget i |
517 $ hg forget i |
583 c |
592 c |
584 |
593 |
585 Commit and show expansion in original and copy |
594 Commit and show expansion in original and copy |
586 |
595 |
587 $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' |
596 $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' |
|
597 committing files: |
588 c |
598 c |
589 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
599 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
|
600 committing manifest |
|
601 committing changelog |
590 overwriting c expanding keywords |
602 overwriting c expanding keywords |
591 committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d |
603 committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d |
592 $ cat a c |
604 $ cat a c |
593 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
605 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
594 do not process $Id: |
606 do not process $Id: |
754 ? log |
766 ? log |
755 |
767 |
756 Commit with multi-line message and custom expansion |
768 Commit with multi-line message and custom expansion |
757 |
769 |
758 $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' |
770 $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' |
|
771 committing files: |
759 a |
772 a |
|
773 committing manifest |
|
774 committing changelog |
760 overwriting a expanding keywords |
775 overwriting a expanding keywords |
761 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
776 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
762 $ rm log |
777 $ rm log |
763 |
778 |
764 Stat, verify and show custom expansion (firstline) |
779 Stat, verify and show custom expansion (firstline) |
796 remove with status checks |
811 remove with status checks |
797 |
812 |
798 $ hg debugrebuildstate |
813 $ hg debugrebuildstate |
799 $ hg remove a |
814 $ hg remove a |
800 $ hg --debug commit -m rma |
815 $ hg --debug commit -m rma |
|
816 committing files: |
|
817 committing manifest |
|
818 committing changelog |
801 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
819 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
802 $ hg status |
820 $ hg status |
803 ? c |
821 ? c |
804 |
822 |
805 Rollback, revert, and check expansion |
823 Rollback, revert, and check expansion |
866 |
884 |
867 >>> import re |
885 >>> import re |
868 >>> text = re.sub(r'(Id.*)', r'\1 rejecttest', open('a').read()) |
886 >>> text = re.sub(r'(Id.*)', r'\1 rejecttest', open('a').read()) |
869 >>> open('a', 'wb').write(text) |
887 >>> open('a', 'wb').write(text) |
870 $ hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>' |
888 $ hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>' |
|
889 committing files: |
871 a |
890 a |
|
891 committing manifest |
|
892 committing changelog |
872 overwriting a expanding keywords |
893 overwriting a expanding keywords |
873 committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
894 committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
874 $ hg export -o ../rejecttest.diff tip |
895 $ hg export -o ../rejecttest.diff tip |
875 $ cd ../Test |
896 $ cd ../Test |
876 $ hg import ../rejecttest.diff |
897 $ hg import ../rejecttest.diff |
906 $ hg --verbose kwexpand x/a |
927 $ hg --verbose kwexpand x/a |
907 abort: outstanding uncommitted changes |
928 abort: outstanding uncommitted changes |
908 [255] |
929 [255] |
909 $ cd x |
930 $ cd x |
910 $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' |
931 $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' |
|
932 committing files: |
911 x/a |
933 x/a |
912 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
934 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
|
935 committing manifest |
|
936 committing changelog |
913 overwriting x/a expanding keywords |
937 overwriting x/a expanding keywords |
914 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |
938 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |
915 $ cat a |
939 $ cat a |
916 expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
940 expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
917 do not process $Id: |
941 do not process $Id: |