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 |
744 ? c |
745 ? c |
745 ? log |
746 ? log |
746 |
747 |
747 Commit with multi-line message and custom expansion |
748 Commit with multi-line message and custom expansion |
748 |
749 |
|
750 |Note: |
|
751 | |
|
752 | After the last rollback, the "unserved" branchheads cache became invalid, but |
|
753 | all changeset in the repo were public. So filtering wise: |
|
754 | "mutable" == "unserved" == ΓΈ. |
|
755 | |
|
756 | As the "unserved" cache is invalid, we fall back to "mutable" cache. But not |
|
757 | update is needed between "mutable" and "unserved" cache and the "unserved" |
|
758 | cache is not updated on disk. The on disk version therefor stay invalid for |
|
759 | some time. This explains why the "unserved" branchheads cache is detect |
|
760 | invalid here. |
|
761 |
749 $ 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>' |
750 invalid branchheads cache: tip differs |
763 invalid branchheads cache (unserved): tip differs |
751 a |
764 a |
752 invalid branchheads cache: tip differs |
765 invalid branchheads cache: tip differs |
|
766 invalid branchheads cache (unserved): tip differs |
753 overwriting a expanding keywords |
767 overwriting a expanding keywords |
754 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
768 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
755 $ rm log |
769 $ rm log |
756 |
770 |
757 Stat, verify and show custom expansion (firstline) |
771 Stat, verify and show custom expansion (firstline) |
789 remove with status checks |
803 remove with status checks |
790 |
804 |
791 $ hg debugrebuildstate |
805 $ hg debugrebuildstate |
792 $ hg remove a |
806 $ hg remove a |
793 $ hg --debug commit -m rma |
807 $ hg --debug commit -m rma |
794 invalid branchheads cache: tip differs |
|
795 invalid branchheads cache: tip differs |
808 invalid branchheads cache: tip differs |
796 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
809 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
797 $ hg status |
810 $ hg status |
798 ? c |
811 ? c |
799 |
812 |
901 $ hg --verbose kwexpand x/a |
914 $ hg --verbose kwexpand x/a |
902 abort: outstanding uncommitted changes |
915 abort: outstanding uncommitted changes |
903 [255] |
916 [255] |
904 $ cd x |
917 $ cd x |
905 $ 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>' |
906 invalid branchheads cache: tip differs |
|
907 x/a |
919 x/a |
908 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
920 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
909 invalid branchheads cache: tip differs |
921 invalid branchheads cache: tip differs |
910 overwriting x/a expanding keywords |
922 overwriting x/a expanding keywords |
911 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |
923 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |