equal
deleted
inserted
replaced
132 s4$ Added e and f (unstable) |
132 s4$ Added e and f (unstable) |
133 s3$ split2 (unstable) |
133 s3$ split2 (unstable) |
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 |
|
138 Test case with divergence |
|
139 ------------------------- |
|
140 |
|
141 $ hg evolve --all |
|
142 move:[s3] split2 |
|
143 atop:[s2] split1 |
|
144 move:[s4] Added e and f |
|
145 working directory is now at ec94a1ed1330 |
|
146 $ hg up s4 |
|
147 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
148 $ hg id -r . |
|
149 ec94a1ed1330 tip |
|
150 $ hg up --hidden 'min(precursors(.))' |
|
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
152 updated to hidden changeset f1d3649d6a8b |
|
153 (hidden revision 'f1d3649d6a8b' was rewritten as: ec94a1ed1330) |
|
154 working directory parent is obsolete! (f1d3649d6a8b) |
|
155 (use 'hg evolve' to update to its successor: ec94a1ed1330) |
|
156 $ hg amend -d '0 1' |
|
157 1 new orphan changesets |
|
158 2 new content-divergent changesets |
|
159 $ hg rebase -r . -d ec94a1ed1330~1 |
|
160 rebasing 9:eb3b16fef8ea "Added e and f" (tip foo) |
|
161 $ hg stack |
|
162 ### topic: foo (2 heads) |
|
163 ### target: default (branch) |
|
164 s5: Added e and f |
|
165 s3^ split2 (base) |
|
166 s4@ Added e and f (current) |
|
167 s3: split2 |
|
168 s2: split1 |
|
169 s1: Added a and b |
|
170 s0^ Added foo (base) |