equal
deleted
inserted
replaced
39 $ hg phase --public |
39 $ hg phase --public |
40 |
40 |
41 Amend again to create a cset divergent to public one: |
41 Amend again to create a cset divergent to public one: |
42 |
42 |
43 $ hg up 1 --hidden -q |
43 $ hg up 1 --hidden -q |
44 updated to hidden changeset 5f6d8a4bf34a |
44 updating to a hidden changeset 5f6d8a4bf34a |
45 (hidden revision '5f6d8a4bf34a' was rewritten as: 44f360db368f) |
45 (hidden revision '5f6d8a4bf34a' was rewritten as: 44f360db368f) |
46 working directory parent is obsolete! (5f6d8a4bf34a) |
46 working directory parent is obsolete! (5f6d8a4bf34a) |
47 |
47 |
48 $ echo "I am second" >> b |
48 $ echo "I am second" >> b |
49 $ hg ci --amend -m "updated b" |
49 $ hg ci --amend -m "updated b" |
136 $ hg phase --public |
136 $ hg phase --public |
137 |
137 |
138 Amend again to create a cset divergent to public one: |
138 Amend again to create a cset divergent to public one: |
139 |
139 |
140 $ hg up 1 --hidden -q |
140 $ hg up 1 --hidden -q |
141 updated to hidden changeset 5f6d8a4bf34a |
141 updating to a hidden changeset 5f6d8a4bf34a |
142 (hidden revision '5f6d8a4bf34a' was rewritten as: 580f2d01e52c) |
142 (hidden revision '5f6d8a4bf34a' was rewritten as: 580f2d01e52c) |
143 working directory parent is obsolete! (5f6d8a4bf34a) |
143 working directory parent is obsolete! (5f6d8a4bf34a) |
144 |
144 |
145 $ echo "I am bar" > b |
145 $ echo "I am bar" > b |
146 $ hg ci --amend -m "updated b" |
146 $ hg ci --amend -m "updated b" |
241 draft |
241 draft |
242 |
242 |
243 |
243 |
244 On user side: user has not pulled yet and amended the rev 2 which created the divergence after pull: |
244 On user side: user has not pulled yet and amended the rev 2 which created the divergence after pull: |
245 $ hg up 2 --hidden -q |
245 $ hg up 2 --hidden -q |
246 updated to hidden changeset 155349b645be |
246 updating to a hidden changeset 155349b645be |
247 (hidden revision '155349b645be' was rewritten as: c0d7ee6604ea) |
247 (hidden revision '155349b645be' was rewritten as: c0d7ee6604ea) |
248 working directory parent is obsolete! (155349b645be) |
248 working directory parent is obsolete! (155349b645be) |
249 |
249 |
250 $ echo cc >> c |
250 $ echo cc >> c |
251 $ hg ci --amend -m "updated c" |
251 $ hg ci --amend -m "updated c" |