241   switching to topic food

   241   switching to topic food

   242   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

   242   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

   243   $ hg rebase

   243   $ hg rebase

   244   rebasing 1:13900241408b "adding condiments"

   244   rebasing 1:13900241408b "adding condiments"

   245   merging shopping

   245   merging shopping

   246   rebasing 2:287de11b401f "adding fruits"

   247   rebasing 2:287de11b401f "adding fruits"

   247   merging shopping

   248   merging shopping

   248   $ hg log --graph

   249   $ hg log --graph

   249   @  changeset:   5:2d50db8b5b4c

   250   @  changeset:   5:2d50db8b5b4c

   250   |  tag:         tip

   251   |  tag:         tip

   272   

   273   

   273 

   274 

   274 The topic information will fade out when we publish the changesets::

   275 The topic information will fade out when we publish the changesets::

   275 

   276 

   276   $ hg topic

   277   $ hg topic

   278   $ hg push

   279   $ hg push

   279   pushing to $TESTTMP/server (glob)

   280   pushing to $TESTTMP/server (glob)

   280   searching for changes

   281   searching for changes

   281   adding changesets

   282   adding changesets

   282   adding manifests

   283   adding manifests

   283   adding file changes

   284   adding file changes

   284   added 2 changesets with 2 changes to 1 files

   285   added 2 changesets with 2 changes to 1 files

   285   2 new obsolescence markers

   286   2 new obsolescence markers

   286   $ hg topic

   287   $ hg topic

   287   $ hg log --graph

   289   $ hg log --graph

   288   @  changeset:   5:2d50db8b5b4c

   290   @  changeset:   5:2d50db8b5b4c

   289   |  tag:         tip

   291   |  tag:         tip

   290   |  user:        test

   292   |  user:        test

   291   |  date:        Thu Jan 01 00:00:00 1970 +0000

   293   |  date:        Thu Jan 01 00:00:00 1970 +0000

   403 There is new changes! We can simply use ``hg rebase`` to update our changeset on top of the latest::

   405 There is new changes! We can simply use ``hg rebase`` to update our changeset on top of the latest::

   404 

   406 

   405   $ hg rebase

   407   $ hg rebase

   406   rebasing 6:183984ef46d1 "Adding hammer"

   408   rebasing 6:183984ef46d1 "Adding hammer"

   407   merging shopping

   409   merging shopping

   408   rebasing 7:cffff85af537 "Adding saw"

   411   rebasing 7:cffff85af537 "Adding saw"

   409   merging shopping

   412   merging shopping

   410   rebasing 8:34255b455dac "Adding drill"

   413   rebasing 8:34255b455dac "Adding drill"

   411   merging shopping

   414   merging shopping

   412 

   415 

   413 But what about the other topic? You can use 'hg topic --verbose' to see information about them::

   416 But what about the other topic? You can use 'hg topic --verbose' to see information about them::

   414 

   417 

   415   $ hg topic --verbose

   418   $ hg topic --verbose

   416      drinks (on branch: default, 2 changesets, 2 behind)

   419      drinks (on branch: default, 2 changesets, 2 behind)

   418 

   421 

   419 The "2 behind" is telling you that there is 2 new changesets on the named branch of the topic. You need to merge or rebase to incorporate them.

   422 The "2 behind" is telling you that there is 2 new changesets on the named branch of the topic. You need to merge or rebase to incorporate them.

   420 

   423 

   421 Pushing that topic would create a new heads will be prevented::

   424 Pushing that topic would create a new heads will be prevented::

   422 

   425 

   431 Even after a rebase Pushing all active topics at the same time will complains about the multiple heads it would create on that branch::

   434 Even after a rebase Pushing all active topics at the same time will complains about the multiple heads it would create on that branch::

   432 

   435 

   433   $ hg rebase -b drinks

   436   $ hg rebase -b drinks

   434   rebasing 9:8dfa45bd5e0c "Adding apple juice"

   437   rebasing 9:8dfa45bd5e0c "Adding apple juice"

   435   merging shopping

   438   merging shopping

   436   rebasing 10:70dfa201ed73 "Adding orange juice"

   440   rebasing 10:70dfa201ed73 "Adding orange juice"

   437   merging shopping

   441   merging shopping

   438   switching to topic tools

   442   switching to topic tools

   439   $ hg push

   443   $ hg push

   440   pushing to $TESTTMP/server (glob)

   444   pushing to $TESTTMP/server (glob)