equal
deleted
inserted
replaced
574 c |
574 c |
575 |
575 |
576 Commit and show expansion in original and copy |
576 Commit and show expansion in original and copy |
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 (unserved): tip differs |
579 c |
580 c |
580 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
581 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
581 overwriting c expanding keywords |
582 overwriting c expanding keywords |
582 committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d |
583 committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d |
583 $ cat a c |
584 $ cat a c |
757 | cache is not updated on disk. The on disk version therefor stay invalid for |
758 | cache is not updated on disk. The on disk version therefor stay invalid for |
758 | some time. This explains why the "unserved" branchheads cache is detect |
759 | some time. This explains why the "unserved" branchheads cache is detect |
759 | invalid here. |
760 | invalid here. |
760 |
761 |
761 $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' |
762 $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' |
762 invalid branchheads cache: tip differs |
|
763 invalid branchheads cache (unserved): tip differs |
763 invalid branchheads cache (unserved): tip differs |
764 a |
764 a |
765 invalid branchheads cache: tip differs |
765 invalid branchheads cache: tip differs |
766 invalid branchheads cache (unserved): tip differs |
766 invalid branchheads cache (unserved): tip differs |
767 overwriting a expanding keywords |
767 overwriting a expanding keywords |
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 invalid branchheads cache: tip differs |
808 invalid branchheads cache: tip differs |
810 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
809 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
811 $ hg status |
810 $ hg status |
812 ? c |
811 ? c |
813 |
812 |
915 $ hg --verbose kwexpand x/a |
914 $ hg --verbose kwexpand x/a |
916 abort: outstanding uncommitted changes |
915 abort: outstanding uncommitted changes |
917 [255] |
916 [255] |
918 $ cd x |
917 $ cd x |
919 $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' |
918 $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' |
920 invalid branchheads cache: tip differs |
|
921 x/a |
919 x/a |
922 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
920 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
923 invalid branchheads cache: tip differs |
921 invalid branchheads cache: tip differs |
924 overwriting x/a expanding keywords |
922 overwriting x/a expanding keywords |
925 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |
923 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |