equal
deleted
inserted
replaced
1512 t1: Adding hammer to the shopping list |
1512 t1: Adding hammer to the shopping list |
1513 t0^ add a pair of shoes (base) |
1513 t0^ add a pair of shoes (base) |
1514 |
1514 |
1515 Solving this situation is easy with a topic: use merge or rebase. |
1515 Solving this situation is easy with a topic: use merge or rebase. |
1516 Merge within a multi-headed stack will use the other topic head as |
1516 Merge within a multi-headed stack will use the other topic head as |
1517 destination if the topic has two heads. |
1517 destination if the topic has two heads. But rebasing will yield a |
|
1518 completely linear history so it's what we will do. |
1518 |
1519 |
1519 $ hg log -G |
1520 $ hg log -G |
1520 @ changeset: 21:f936c6da9d61 |
1521 @ changeset: 21:f936c6da9d61 |
1521 | tag: tip |
1522 | tag: tip |
1522 | topic: tools |
1523 | topic: tools |
1749 rebasing 19:d5c51ee5762a "Adding saw" |
1750 rebasing 19:d5c51ee5762a "Adding saw" |
1750 merging shopping |
1751 merging shopping |
1751 rebasing 20:bae3758e46bf "Adding drill" |
1752 rebasing 20:bae3758e46bf "Adding drill" |
1752 merging shopping |
1753 merging shopping |
1753 |
1754 |
1754 $ hg commit -m "Merge tools" |
|
1755 nothing changed |
|
1756 [1] |
|
1757 |
|
1758 $ hg stack |
1755 $ hg stack |
1759 ### topic: tools |
1756 ### topic: tools |
1760 ### branch: default, 2 behind |
1757 ### branch: default, 2 behind |
1761 t4@ Adding drill (current) |
1758 t4@ Adding drill (current) |
1762 t3: Adding saw |
1759 t3: Adding saw |