equal
deleted
inserted
replaced
148 |
148 |
149 Add commits to topic |
149 Add commits to topic |
150 |
150 |
151 $ echo topic work >> alpha |
151 $ echo topic work >> alpha |
152 $ hg ci -m 'start on narf' |
152 $ hg ci -m 'start on narf' |
|
153 active topic 'narf' grew its first changeset |
153 $ hg co .^ |
154 $ hg co .^ |
154 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
155 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
155 $ hg topic fran |
156 $ hg topic fran |
156 marked working directory as topic: fran |
157 marked working directory as topic: fran |
157 $ hg topics |
158 $ hg topics |
159 narf |
160 narf |
160 $ hg topics --current |
161 $ hg topics --current |
161 fran |
162 fran |
162 $ echo >> fran work >> beta |
163 $ echo >> fran work >> beta |
163 $ hg ci -m 'start on fran' |
164 $ hg ci -m 'start on fran' |
|
165 active topic 'fran' grew its first changeset |
164 $ hg co narf |
166 $ hg co narf |
165 switching to topic narf |
167 switching to topic narf |
166 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
168 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
167 $ hg topic |
169 $ hg topic |
168 fran |
170 fran |
315 $ hg topic |
317 $ hg topic |
316 $ echo what >> alpha |
318 $ echo what >> alpha |
317 $ hg topic query |
319 $ hg topic query |
318 marked working directory as topic: query |
320 marked working directory as topic: query |
319 $ hg ci -m 'what is narf, pinky?' |
321 $ hg ci -m 'what is narf, pinky?' |
|
322 active topic 'query' grew its first changeset |
320 $ hg log -Gl2 |
323 $ hg log -Gl2 |
321 @ changeset: 5:c01515cfc331 |
324 @ changeset: 5:c01515cfc331 |
322 | tag: tip |
325 | tag: tip |
323 | topic: query |
326 | topic: query |
324 | user: test |
327 | user: test |
474 searching for changes |
477 searching for changes |
475 adding changesets |
478 adding changesets |
476 adding manifests |
479 adding manifests |
477 adding file changes |
480 adding file changes |
478 added 1 changesets with 1 changes to 1 files (+1 heads) |
481 added 1 changesets with 1 changes to 1 files (+1 heads) |
479 active topic 'query' is now empty |
|
480 (run 'hg heads' to see heads) |
482 (run 'hg heads' to see heads) |
481 $ hg topics |
483 $ hg topics |
482 fran |
484 fran |
483 * query |
485 * query |
484 $ hg log -Gr 'draft()' |
486 $ hg log -Gr 'draft()' |
734 Amend a topic |
736 Amend a topic |
735 |
737 |
736 $ hg topic watwat |
738 $ hg topic watwat |
737 marked working directory as topic: watwat |
739 marked working directory as topic: watwat |
738 $ hg ci --amend |
740 $ hg ci --amend |
|
741 active topic 'watwat' grew its first changeset |
739 $ hg log -Gr 'draft()' |
742 $ hg log -Gr 'draft()' |
740 @ changeset: 15:6c40a4c21bbe |
743 @ changeset: 15:6c40a4c21bbe |
741 | tag: tip |
744 | tag: tip |
742 | topic: watwat |
745 | topic: watwat |
743 | parent: 13:686a642006db |
746 | parent: 13:686a642006db |
792 |
795 |
793 Using the current flag |
796 Using the current flag |
794 |
797 |
795 $ hg topic changewat |
798 $ hg topic changewat |
796 $ hg topics --rev '13::17' --current |
799 $ hg topics --rev '13::17' --current |
|
800 active topic 'changewat' grew its 2 first changesets |
797 changed topic on 2 changes |
801 changed topic on 2 changes |
798 |
802 |
799 $ hg log -Gr 'draft()' |
803 $ hg log -Gr 'draft()' |
800 @ changeset: 19:56c83be6105f |
804 @ changeset: 19:56c83be6105f |
801 | tag: tip |
805 | tag: tip |
844 | summary: start on fran |
848 | summary: start on fran |
845 | |
849 | |
846 |
850 |
847 $ hg topics --rev 't1::' changewut |
851 $ hg topics --rev 't1::' changewut |
848 switching to topic changewut |
852 switching to topic changewut |
|
853 active topic 'changewat' is now empty |
849 changed topic on 3 changes |
854 changed topic on 3 changes |
850 |
855 |
851 $ hg log -Gr 'draft()' |
856 $ hg log -Gr 'draft()' |
852 @ changeset: 23:729ed5717393 |
857 @ changeset: 23:729ed5717393 |
853 | tag: tip |
858 | tag: tip |
945 changed topic on 1 changes |
950 changed topic on 1 changes |
946 |
951 |
947 $ hg add b |
952 $ hg add b |
948 $ hg topic topic1990 |
953 $ hg topic topic1990 |
949 $ hg ci -m "Added b" --config devel.default-date="631152000 0" |
954 $ hg ci -m "Added b" --config devel.default-date="631152000 0" |
|
955 active topic 'topic1990' grew its first changeset |
950 $ hg add c |
956 $ hg add c |
951 $ hg topic topic2010 |
957 $ hg topic topic2010 |
952 $ hg ci -m "Added c" --config devel.default-date="1262304000 0" |
958 $ hg ci -m "Added c" --config devel.default-date="1262304000 0" |
|
959 active topic 'topic2010' grew its first changeset |
953 |
960 |
954 $ hg log -G |
961 $ hg log -G |
955 @ changeset: 3:9048b194797d |
962 @ changeset: 3:9048b194797d |
956 | tag: tip |
963 | tag: tip |
957 | topic: topic2010 |
964 | topic: topic2010 |