equal
deleted
inserted
replaced
84 1 new orphan changesets |
84 1 new orphan changesets |
85 |
85 |
86 $ hg stack |
86 $ hg stack |
87 ### topic: foo |
87 ### topic: foo |
88 ### target: default (branch) |
88 ### target: default (branch) |
89 s4$ Added e and f (unstable) |
89 s4$ Added e and f (orphan) |
90 s3@ split2 (current) |
90 s3@ split2 (current) |
91 s2: split1 |
91 s2: split1 |
92 s1: Added a and b |
92 s1: Added a and b |
93 s0^ Added foo (base) |
93 s0^ Added foo (base) |
94 |
94 |
127 o f360 Added foo |
127 o f360 Added foo |
128 |
128 |
129 $ hg stack |
129 $ hg stack |
130 ### topic: foo (2 heads) |
130 ### topic: foo (2 heads) |
131 ### target: default (branch), 2 behind |
131 ### target: default (branch), 2 behind |
132 s4$ Added e and f (unstable) |
132 s4$ Added e and f (orphan) |
133 s3$ split2 (unstable) |
133 s3$ split2 (orphan) |
134 s2@ split1 (current) |
134 s2@ split1 (current) |
135 s1: Added a and b |
135 s1: Added a and b |
136 s0^ Added foo (base) |
136 s0^ Added foo (base) |
137 |
137 |
138 Test case with divergence |
138 Test case with divergence |
159 $ hg rebase -r . -d ec94a1ed1330~1 |
159 $ hg rebase -r . -d ec94a1ed1330~1 |
160 rebasing 9:eb3b16fef8ea "Added e and f" (tip foo) |
160 rebasing 9:eb3b16fef8ea "Added e and f" (tip foo) |
161 $ hg stack |
161 $ hg stack |
162 ### topic: foo (2 heads) |
162 ### topic: foo (2 heads) |
163 ### target: default (branch) |
163 ### target: default (branch) |
164 s5: Added e and f |
164 s5$ Added e and f (content divergent) |
165 s3^ split2 (base) |
165 s3^ split2 (base) |
166 s4@ Added e and f (current) |
166 s4@ Added e and f (content divergent current) |
167 s3: split2 |
167 s3: split2 |
168 s2: split1 |
168 s2: split1 |
169 s1: Added a and b |
169 s1: Added a and b |
170 s0^ Added foo (base) |
170 s0^ Added foo (base) |
171 |
171 |