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