equal
deleted
inserted
replaced
79 diff --git a/d b/d |
79 diff --git a/d b/d |
80 new file mode 100644 |
80 new file mode 100644 |
81 examine changes to 'd'? [Ynesfdaq?] n |
81 examine changes to 'd'? [Ynesfdaq?] n |
82 |
82 |
83 Done splitting? [yN] y |
83 Done splitting? [yN] y |
84 1 new orphan changesets |
|
85 |
84 |
86 $ hg stack |
85 $ hg stack |
87 ### topic: foo |
86 ### topic: foo |
88 ### target: default (branch) |
87 ### target: default (branch) |
89 s4$ Added e and f (unstable) |
88 s4$ Added e and f (unstable) |
93 s0^ Added foo (base) |
92 s0^ Added foo (base) |
94 |
93 |
95 $ hg show work |
94 $ hg show work |
96 @ 5cce (foo) split2 |
95 @ 5cce (foo) split2 |
97 o f26c (foo) split1 |
96 o f26c (foo) split1 |
98 | * f1d3 (foo) Added e and f |
97 | o f1d3 (foo) Added e and f |
99 | x 8e82 (foo) Added c and d |
98 | x 8e82 (foo) Added c and d |
100 |/ |
99 |/ |
101 o 002b (foo) Added a and b |
100 o 002b (foo) Added a and b |
102 o f360 Added foo |
101 o f360 Added foo |
103 |
102 |
115 |
114 |
116 $ hg amend |
115 $ hg amend |
117 1 new orphan changesets |
116 1 new orphan changesets |
118 $ hg show work |
117 $ hg show work |
119 @ 7d94 (foo) split1 |
118 @ 7d94 (foo) split1 |
120 | * 5cce (foo) split2 |
119 | o 5cce (foo) split2 |
121 | x f26c (foo) split1 |
120 | x f26c (foo) split1 |
122 |/ |
121 |/ |
123 | * f1d3 (foo) Added e and f |
122 | o f1d3 (foo) Added e and f |
124 | x 8e82 (foo) Added c and d |
123 | x 8e82 (foo) Added c and d |
125 |/ |
124 |/ |
126 o 002b (foo) Added a and b |
125 o 002b (foo) Added a and b |
127 o f360 Added foo |
126 o f360 Added foo |
128 |
127 |
146 $ hg up s4 |
145 $ hg up s4 |
147 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
146 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
148 $ hg id -r . |
147 $ hg id -r . |
149 ec94a1ed1330 tip |
148 ec94a1ed1330 tip |
150 $ hg up --hidden 'min(precursors(.))' |
149 $ hg up --hidden 'min(precursors(.))' |
151 updating to a hidden changeset f1d3649d6a8b |
|
152 (hidden revision 'f1d3649d6a8b' was rewritten as: ec94a1ed1330) |
|
153 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
150 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
154 working directory parent is obsolete! (f1d3649d6a8b) |
151 working directory parent is obsolete! (f1d3649d6a8b) |
155 (use 'hg evolve' to update to its successor: ec94a1ed1330) |
152 (use 'hg evolve' to update to its successor: ec94a1ed1330) |
156 $ hg amend -d '0 1' |
153 $ hg amend -d '0 1' |
157 1 new orphan changesets |
154 1 new orphan changesets |