equal
deleted
inserted
replaced
191 Before committing, however, we need to switch to a new bookmark for the second |
191 Before committing, however, we need to switch to a new bookmark for the second |
192 changeset. Otherwise we would inadvertently move the bookmark for our first changeset. |
192 changeset. Otherwise we would inadvertently move the bookmark for our first changeset. |
193 It is therefore advisable to always set the bookmark before committing:: |
193 It is therefore advisable to always set the bookmark before committing:: |
194 |
194 |
195 $ hg book feature-B |
195 $ hg book feature-B |
196 $ hg commit --message "another feature" |
196 $ hg commit --message "another feature (child of $(hg log -r . -T '{node|short}'))" |
197 |
197 |
198 So here we are:: |
198 So here we are:: |
199 |
199 |
200 $ hg book |
200 $ hg book |
201 feature-A 1:568a468b60fc |
201 feature-A 1:568a468b60fc |
202 * feature-B 2:7b36850622b2 |
202 * feature-B 2:73296a82292a |
203 |
203 |
204 |
204 |
205 Fix The Second Patch |
205 Fix The Second Patch |
206 -------------------- |
206 -------------------- |
207 |
207 |
220 |
220 |
221 This results in a new single changeset for our amended changeset, and the old |
221 This results in a new single changeset for our amended changeset, and the old |
222 changeset plus the updating changeset are hidden from view by default:: |
222 changeset plus the updating changeset are hidden from view by default:: |
223 |
223 |
224 $ hg log |
224 $ hg log |
225 4 feature-B: another feature - test |
225 4 feature-B: another feature (child of 568a468b60fc) - test |
226 1 feature-A: a nifty feature - test |
226 1 feature-A: a nifty feature - test |
227 0 : base - test |
227 0 : base - test |
228 |
228 |
229 $ hg up feature-A -q |
229 $ hg up feature-A -q |
230 $ hg bookmark -i feature-A |
230 $ hg bookmark -i feature-A |
240 |
240 |
241 $ hg amend |
241 $ hg amend |
242 1 new unstable changesets |
242 1 new unstable changesets |
243 $ hg log |
243 $ hg log |
244 6 feature-A: a nifty feature - test |
244 6 feature-A: a nifty feature - test |
245 4 feature-B: another feature - test |
245 4 feature-B: another feature (child of 568a468b60fc) - test |
246 1 : a nifty feature - test |
246 1 : a nifty feature - test |
247 0 : base - test |
247 0 : base - test |
248 $ hg up -q 0 |
248 $ hg up -q 0 |
249 $ glog --hidden |
249 $ glog --hidden |
250 o 6:ba0ec09b1bab@default(draft) a nifty feature |
250 o 6:ba0ec09b1bab@default(draft) a nifty feature |
299 all solving bumped troubled |
299 all solving bumped troubled |
300 |
300 |
301 $ hg glog |
301 $ hg glog |
302 @ 8 feature-B: another feature that rox - test |
302 @ 8 feature-B: another feature that rox - test |
303 | |
303 | |
304 | o 7 : another feature - test |
304 | o 7 : another feature (child of 568a468b60fc) - test |
305 |/ |
305 |/ |
306 o 6 feature-A: a nifty feature - test |
306 o 6 feature-A: a nifty feature - test |
307 | |
307 | |
308 o 0 : base - test |
308 o 0 : base - test |
309 |
309 |
377 | |
377 | |
378 o 14 : dansk 2! - test |
378 o 14 : dansk 2! - test |
379 | |
379 | |
380 o 13 feature-B: dansk! - test |
380 o 13 feature-B: dansk! - test |
381 | |
381 | |
382 o 7 : another feature - test |
382 o 7 : another feature (child of 568a468b60fc) - test |
383 | |
383 | |
384 o 6 feature-A: a nifty feature - test |
384 o 6 feature-A: a nifty feature - test |
385 | |
385 | |
386 o 0 : base - test |
386 o 0 : base - test |
387 |
387 |
745 $ cd ../work |
745 $ cd ../work |
746 $ hg fold .^ --message "Folding with custom commit message" |
746 $ hg fold .^ --message "Folding with custom commit message" |
747 2 changesets folded |
747 2 changesets folded |
748 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
748 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
749 $ glog |
749 $ glog |
750 @ 16:e6d8dace77a1@default(draft) Folding with custom commit message |
750 @ 16:d0aee199f74c@default(draft) Folding with custom commit message |
751 | |
751 | |
752 o 13:e9c952d5bc4b@default(draft) dansk! |
752 o 13:b0258f43f9d0@default(draft) dansk! |
753 | |
753 | |
754 o 7:abe98aeaaa35@default(public) another feature |
754 o 7:5b410c3ae5af@default(public) another feature (child of 568a468b60fc) |
755 | |
755 | |
756 o 6:ba0ec09b1bab@default(public) a nifty feature |
756 o 6:ba0ec09b1bab@default(public) a nifty feature |
757 | |
757 | |
758 o 0:e55e0562ee93@default(public) base |
758 o 0:e55e0562ee93@default(public) base |
759 |
759 |
764 |
764 |
765 $ hg fold .^ --logfile commit-message |
765 $ hg fold .^ --logfile commit-message |
766 2 changesets folded |
766 2 changesets folded |
767 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
767 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
768 $ hg qlog |
768 $ hg qlog |
769 17 - 2451d817c756 A longer |
769 17 - bf2fd466ccd4 A longer |
770 commit message (draft) |
770 commit message (draft) |
771 7 - abe98aeaaa35 another feature (public) |
771 7 - 5b410c3ae5af another feature (child of 568a468b60fc) (public) |
772 6 - ba0ec09b1bab a nifty feature (public) |
772 6 - ba0ec09b1bab a nifty feature (public) |
773 0 - e55e0562ee93 base (public) |
773 0 - e55e0562ee93 base (public) |