equal
deleted
inserted
replaced
577 |
577 |
578 $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' |
578 $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' |
579 invalid branchheads cache (served): tip differs |
579 invalid branchheads cache (served): tip differs |
580 c |
580 c |
581 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
581 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
|
582 invalid branchheads cache (served): tip differs |
582 overwriting c expanding keywords |
583 overwriting c expanding keywords |
583 committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d |
584 committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d |
584 $ cat a c |
585 $ cat a c |
585 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
586 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
586 do not process $Id: |
587 do not process $Id: |
760 | invalid here. |
761 | invalid here. |
761 |
762 |
762 $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' |
763 $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' |
763 invalid branchheads cache (served): tip differs |
764 invalid branchheads cache (served): tip differs |
764 a |
765 a |
765 invalid branchheads cache: tip differs |
|
766 invalid branchheads cache (served): tip differs |
766 invalid branchheads cache (served): tip differs |
767 overwriting a expanding keywords |
767 overwriting a expanding keywords |
768 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
768 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
769 $ rm log |
769 $ rm log |
770 |
770 |
803 remove with status checks |
803 remove with status checks |
804 |
804 |
805 $ hg debugrebuildstate |
805 $ hg debugrebuildstate |
806 $ hg remove a |
806 $ hg remove a |
807 $ hg --debug commit -m rma |
807 $ hg --debug commit -m rma |
808 invalid branchheads cache: tip differs |
|
809 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
808 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
810 $ hg status |
809 $ hg status |
811 ? c |
810 ? c |
812 |
811 |
813 Rollback, revert, and check expansion |
812 Rollback, revert, and check expansion |
916 [255] |
915 [255] |
917 $ cd x |
916 $ cd x |
918 $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' |
917 $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' |
919 x/a |
918 x/a |
920 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
919 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
921 invalid branchheads cache: tip differs |
|
922 overwriting x/a expanding keywords |
920 overwriting x/a expanding keywords |
923 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |
921 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |
924 $ cat a |
922 $ cat a |
925 expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
923 expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
926 do not process $Id: |
924 do not process $Id: |