equal
deleted
inserted
replaced
16 > git = 1 |
16 > git = 1 |
17 > unified = 0 |
17 > unified = 0 |
18 > [ui] |
18 > [ui] |
19 > interactive = true |
19 > interactive = true |
20 > [extensions] |
20 > [extensions] |
21 > hgext.graphlog= |
|
22 > rebase= |
21 > rebase= |
23 > EOF |
22 > EOF |
24 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
23 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
25 $ echo "topic=$(echo $(dirname $TESTDIR))/hgext3rd/topic/" >> $HGRCPATH |
24 $ echo "topic=$(echo $(dirname $TESTDIR))/hgext3rd/topic/" >> $HGRCPATH |
26 $ mkcommit() { |
25 $ mkcommit() { |
44 $ mkcommit feature1 |
43 $ mkcommit feature1 |
45 $ hg stack |
44 $ hg stack |
46 ### topic: myfeature |
45 ### topic: myfeature |
47 ### branch: default |
46 ### branch: default |
48 t1@ add feature1 (current) |
47 t1@ add feature1 (current) |
49 ^ add ROOT |
48 t0^ add ROOT (base) |
50 $ logtopic |
49 $ logtopic |
51 @ 1:39e7a938055e87615edf675c24a10997ff05bb06 |
50 @ 1:39e7a938055e87615edf675c24a10997ff05bb06 |
52 | topics: myfeature |
51 | topics: myfeature |
53 o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 |
52 o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 |
54 topics: |
53 topics: |
74 switching to topic myfeature |
73 switching to topic myfeature |
75 $ hg stack |
74 $ hg stack |
76 ### topic: myfeature |
75 ### topic: myfeature |
77 ### branch: default |
76 ### branch: default |
78 t1@ add feature1 (current) |
77 t1@ add feature1 (current) |
79 ^ add default |
78 t0^ add default (base) |
80 $ logtopic |
79 $ logtopic |
81 @ 3:fc6593661cf3256ba165cbccd6019ead17cc3726 |
80 @ 3:fc6593661cf3256ba165cbccd6019ead17cc3726 |
82 | topics: myfeature |
81 | topics: myfeature |
83 o 2:be7622a7a0f43ba713e152f56441275f8e8711ef |
82 o 2:be7622a7a0f43ba713e152f56441275f8e8711ef |
84 | topics: |
83 | topics: |
88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
87 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
89 $ hg stack |
88 $ hg stack |
90 ### topic: myfeature |
89 ### topic: myfeature |
91 ### branch: default |
90 ### branch: default |
92 t1@ add feature1 (current) |
91 t1@ add feature1 (current) |
93 ^ add default |
92 t0^ add default (base) |
94 |
93 |
95 Check that rebase keep the topic in case of merge conflict |
94 Check that rebase keep the topic in case of merge conflict |
96 ---------------------------------------------------------- |
95 ---------------------------------------------------------- |
97 |
96 |
98 Create a common base |
97 Create a common base |
150 topics: |
149 topics: |
151 $ hg stack |
150 $ hg stack |
152 ### topic: myotherfeature |
151 ### topic: myotherfeature |
153 ### branch: default |
152 ### branch: default |
154 t1@ myotherfeature1 (current) |
153 t1@ myotherfeature1 (current) |
155 ^ default3 |
154 t0^ default3 (base) |
156 $ hg update --rev 7 |
155 $ hg update --rev 7 |
157 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
156 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
158 $ hg stack |
157 $ hg stack |
159 ### topic: myotherfeature |
158 ### topic: myotherfeature |
160 ### branch: default |
159 ### branch: default |
161 t1@ myotherfeature1 (current) |
160 t1@ myotherfeature1 (current) |
162 ^ default3 |
161 t0^ default3 (base) |