112 @@ -1,1 +1,1 @@ |
111 @@ -1,1 +1,1 @@ |
113 -c |
112 -c |
114 +foo |
113 +foo |
115 |
114 |
116 $ hg amend |
115 $ hg amend |
117 1 new orphan changesets |
|
118 $ hg show work |
116 $ hg show work |
119 @ 7d94 (foo) split1 |
117 @ 7d94 (foo) split1 |
120 | * 5cce (foo) split2 |
118 | o 5cce (foo) split2 |
121 | x f26c (foo) split1 |
119 | x f26c (foo) split1 |
122 |/ |
120 |/ |
123 | * f1d3 (foo) Added e and f |
121 | o f1d3 (foo) Added e and f |
124 | x 8e82 (foo) Added c and d |
122 | x 8e82 (foo) Added c and d |
125 |/ |
123 |/ |
126 o 002b (foo) Added a and b |
124 o 002b (foo) Added a and b |
127 o f360 Added foo |
125 o f360 Added foo |
128 |
126 |
145 $ hg up s4 |
143 $ hg up s4 |
146 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
144 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
147 $ hg id -r . |
145 $ hg id -r . |
148 ec94a1ed1330 tip |
146 ec94a1ed1330 tip |
149 $ hg up --hidden 'min(precursors(.))' |
147 $ hg up --hidden 'min(precursors(.))' |
150 updating to a hidden changeset f1d3649d6a8b |
|
151 (hidden revision 'f1d3649d6a8b' was rewritten as: ec94a1ed1330) |
|
152 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
148 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
153 working directory parent is obsolete! (f1d3649d6a8b) |
149 working directory parent is obsolete! (f1d3649d6a8b) |
154 (use 'hg evolve' to update to its successor: ec94a1ed1330) |
150 (use 'hg evolve' to update to its successor: ec94a1ed1330) |
155 $ hg amend -d '0 1' |
151 $ hg amend -d '0 1' |
156 1 new orphan changesets |
|
157 2 new content-divergent changesets |
|
158 $ hg rebase -r . -d ec94a1ed1330~1 |
152 $ hg rebase -r . -d ec94a1ed1330~1 |
159 rebasing 9:eb3b16fef8ea "Added e and f" (tip foo) |
153 rebasing 9:eb3b16fef8ea "Added e and f" (tip foo) |
160 $ hg stack |
154 $ hg stack |
161 ### topic: foo (2 heads) |
155 ### topic: foo (2 heads) |
162 ### target: default (branch) |
156 ### target: default (branch) |