equal
deleted
inserted
replaced
139 $ hg amend |
139 $ hg amend |
140 |
140 |
141 Make precursors public |
141 Make precursors public |
142 |
142 |
143 $ hg phase --hidden --public 8 |
143 $ hg phase --hidden --public 8 |
144 1 new phasedivergent changesets |
144 1 new phase-divergent changesets |
145 $ glog |
145 $ glog |
146 @ 12:(73b15c7566e9|d5c7ef82d003)@default\(draft\) bk:\[\] newer a (re) |
146 @ 12:(73b15c7566e9|d5c7ef82d003)@default\(draft\) bk:\[\] newer a (re) |
147 | |
147 | |
148 o 9:7bc2f5967f5e@default(draft) bk:[] add c |
148 o 9:7bc2f5967f5e@default(draft) bk:[] add c |
149 | |
149 | |
226 $ mv a a.old |
226 $ mv a a.old |
227 $ echo 'jungle' > a |
227 $ echo 'jungle' > a |
228 $ cat a.old >> a |
228 $ cat a.old >> a |
229 $ rm a.old |
229 $ rm a.old |
230 $ hg amend |
230 $ hg amend |
231 2 new contentdivergent changesets |
231 2 new content-divergent changesets |
232 $ glog |
232 $ glog |
233 @ 19:eacc9c8240fe@default(draft) bk:[] More addition |
233 @ 19:eacc9c8240fe@default(draft) bk:[] More addition |
234 | |
234 | |
235 | o 17:d2f173e25686@default(draft) bk:[] More addition |
235 | o 17:d2f173e25686@default(draft) bk:[] More addition |
236 |/ |
236 |/ |
336 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
336 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
337 working directory parent is obsolete! (3932c176bbaa) |
337 working directory parent is obsolete! (3932c176bbaa) |
338 (use 'hg evolve' to update to its successor: f344982e63c4) |
338 (use 'hg evolve' to update to its successor: f344982e63c4) |
339 $ echo 'gotta break' >> a |
339 $ echo 'gotta break' >> a |
340 $ hg amend |
340 $ hg amend |
341 2 new contentdivergent changesets |
341 2 new content-divergent changesets |
342 # reamend so that the case is not the first precursor. |
342 # reamend so that the case is not the first precursor. |
343 $ hg amend -m "More addition (2)" |
343 $ hg amend -m "More addition (2)" |
344 $ hg phase 'contentdivergent()' |
344 $ hg phase 'contentdivergent()' |
345 21: draft |
345 21: draft |
346 24: draft |
346 24: draft |