484 $ hg update food |
483 $ hg update food |
485 switching to topic food |
484 switching to topic food |
486 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
485 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
487 |
486 |
488 $ hg rebase |
487 $ hg rebase |
489 rebasing 1:13900241408b "adding condiments" (food) |
488 rebasing 1:13900241408b "adding condiments" |
490 merging shopping |
489 merging shopping |
491 switching to topic food |
490 switching to topic food |
492 rebasing 2:287de11b401f "adding fruits" (food) |
491 rebasing 2:287de11b401f "adding fruits" |
493 merging shopping |
492 merging shopping |
494 |
493 |
495 $ hg log --graph |
494 $ hg log --graph |
496 @ changeset: 5:2d50db8b5b4c |
495 @ changeset: 5:2d50db8b5b4c |
497 | tag: tip |
496 | tag: tip |
834 searching for changes |
833 searching for changes |
835 adding changesets |
834 adding changesets |
836 adding manifests |
835 adding manifests |
837 adding file changes |
836 adding file changes |
838 added 2 changesets with 2 changes to 1 files (+1 heads) |
837 added 2 changesets with 2 changes to 1 files (+1 heads) |
839 new changesets f2d6cacc6115:fbff9bc37a43 |
|
840 (run 'hg heads' to see heads) |
838 (run 'hg heads' to see heads) |
841 |
839 |
842 There are new changes! We can simply use ``hg rebase`` to update our |
840 There are new changes! We can simply use ``hg rebase`` to update our |
843 changeset on top of the latest: |
841 changeset on top of the latest: |
844 |
842 |
1048 penwidth=2.0]; |
1046 penwidth=2.0]; |
1049 } |
1047 } |
1050 #endif |
1048 #endif |
1051 |
1049 |
1052 $ hg rebase |
1050 $ hg rebase |
1053 rebasing 6:183984ef46d1 "Adding hammer" (tools) |
1051 rebasing 6:183984ef46d1 "Adding hammer" |
1054 merging shopping |
1052 merging shopping |
1055 switching to topic tools |
1053 switching to topic tools |
1056 rebasing 7:cffff85af537 "Adding saw" (tools) |
1054 rebasing 7:cffff85af537 "Adding saw" |
1057 merging shopping |
1055 merging shopping |
1058 rebasing 8:34255b455dac "Adding drill" (tools) |
1056 rebasing 8:34255b455dac "Adding drill" |
1059 merging shopping |
1057 merging shopping |
1060 |
1058 |
1061 But what about the other topic? You can use 'hg topics --verbose' to see |
1059 But what about the other topic? You can use 'hg topics --verbose' to see |
1062 information about all the topics: |
1060 information about all the topics: |
1063 |
1061 |
1080 Even after a rebase, pushing all active topics at the same time would publish |
1078 Even after a rebase, pushing all active topics at the same time would publish |
1081 them to the default branch, and then mercurial would complain about the |
1079 them to the default branch, and then mercurial would complain about the |
1082 multiple *public* heads it would create on that branch: |
1080 multiple *public* heads it would create on that branch: |
1083 |
1081 |
1084 $ hg rebase -b drinks |
1082 $ hg rebase -b drinks |
1085 rebasing 9:8dfa45bd5e0c "Adding apple juice" (drinks) |
1083 rebasing 9:8dfa45bd5e0c "Adding apple juice" |
1086 merging shopping |
1084 merging shopping |
1087 switching to topic drinks |
1085 switching to topic drinks |
1088 rebasing 10:70dfa201ed73 "Adding orange juice" (drinks) |
1086 rebasing 10:70dfa201ed73 "Adding orange juice" |
1089 merging shopping |
1087 merging shopping |
1090 switching to topic tools |
1088 switching to topic tools |
1091 |
1089 |
1092 $ hg push |
1090 $ hg push |
1093 pushing to $TESTTMP/server (glob) |
1091 pushing to $TESTTMP/server (glob) |
1196 t2: Adding saw |
1194 t2: Adding saw |
1197 t1@ Adding hammer (current) |
1195 t1@ Adding hammer (current) |
1198 t0^ add a pair of shoes (base) |
1196 t0^ add a pair of shoes (base) |
1199 |
1197 |
1200 $ hg amend -m "Adding hammer to the shopping list" |
1198 $ hg amend -m "Adding hammer to the shopping list" |
1201 2 new orphan changesets |
1199 2 new unstable changesets |
1202 |
1200 |
1203 Understanding the current situation with hg log is not so easy, because |
1201 Understanding the current situation with hg log is not so easy, because |
1204 it shows too many things: |
1202 it shows too many things: |
1205 |
1203 |
1206 $ hg log -G -r "t0::" |
1204 $ hg log -G -r "t0::" |
1225 | |
1223 | |
1226 | o changeset: 15:bb1e6254f532 |
1224 | o changeset: 15:bb1e6254f532 |
1227 | | topic: tools |
1225 | | topic: tools |
1228 | | user: test |
1226 | | user: test |
1229 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1227 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1230 | | instability: orphan |
1228 | | trouble: unstable |
1231 | | summary: Adding drill |
1229 | | summary: Adding drill |
1232 | | |
1230 | | |
1233 | o changeset: 14:d4f97f32f8a1 |
1231 | o changeset: 14:d4f97f32f8a1 |
1234 | | topic: tools |
1232 | | topic: tools |
1235 | | user: test |
1233 | | user: test |
1236 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1234 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1237 | | instability: orphan |
1235 | | trouble: unstable |
1238 | | summary: Adding saw |
1236 | | summary: Adding saw |
1239 | | |
1237 | | |
1240 | x changeset: 13:a8ab3599d53d |
1238 | x changeset: 13:a8ab3599d53d |
1241 |/ topic: tools |
1239 |/ topic: tools |
1242 | user: test |
1240 | user: test |
1243 | date: Thu Jan 01 00:00:00 1970 +0000 |
1241 | date: Thu Jan 01 00:00:00 1970 +0000 |
1244 | obsolete: reworded using amend as 18:b7509bd417f8 |
1242 | obsolete: reworded as b7509bd417f8 |
1245 | summary: Adding hammer |
1243 | summary: Adding hammer |
1246 | |
1244 | |
1247 o changeset: 12:fbff9bc37a43 |
1245 o changeset: 12:fbff9bc37a43 |
1248 | user: test |
1246 | user: test |
1249 ~ date: Thu Jan 01 00:00:00 1970 +0000 |
1247 ~ date: Thu Jan 01 00:00:00 1970 +0000 |
1769 |
1767 |
1770 $ hg up t4 |
1768 $ hg up t4 |
1771 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1769 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1772 |
1770 |
1773 $ hg rebase |
1771 $ hg rebase |
1774 rebasing 19:d5c51ee5762a "Adding saw" (tools) |
1772 rebasing 19:d5c51ee5762a "Adding saw" |
1775 merging shopping |
1773 merging shopping |
1776 rebasing 20:bae3758e46bf "Adding drill" (tools) |
1774 rebasing 20:bae3758e46bf "Adding drill" |
1777 merging shopping |
1775 merging shopping |
1778 |
1776 |
1779 $ hg stack |
1777 $ hg stack |
1780 ### topic: tools |
1778 ### topic: tools |
1781 ### target: default (branch), 2 behind |
1779 ### target: default (branch), 2 behind |
1839 adding changesets |
1837 adding changesets |
1840 adding manifests |
1838 adding manifests |
1841 adding file changes |
1839 adding file changes |
1842 added 4 changesets with 4 changes to 1 files (+1 heads) |
1840 added 4 changesets with 4 changes to 1 files (+1 heads) |
1843 8 new obsolescence markers |
1841 8 new obsolescence markers |
1844 new changesets b7509bd417f8:2d084ac00115 |
|
1845 (run 'hg heads' to see heads) |
1842 (run 'hg heads' to see heads) |
1846 |
1843 |
1847 $ hg topics --verbose |
1844 $ hg topics --verbose |
1848 tools (on branch: default, 4 changesets, 2 behind) |
1845 tools (on branch: default, 4 changesets, 2 behind) |
1849 |
1846 |
1883 searching for changes |
1880 searching for changes |
1884 adding changesets |
1881 adding changesets |
1885 adding manifests |
1882 adding manifests |
1886 adding file changes |
1883 adding file changes |
1887 added 1 changesets with 1 changes to 1 files |
1884 added 1 changesets with 1 changes to 1 files |
1888 new changesets 0d409663a1fd |
|
1889 (run 'hg update' to get a working copy) |
1885 (run 'hg update' to get a working copy) |
1890 |
1886 |
1891 $ hg update |
1887 $ hg update |
1892 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1888 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1893 |
1889 |