Mercurial > evolve
changeset 2978:9280e78dbcba
topics/tuto: prefer rebase over merge and remove the weird merge attempt
author | Aurélien Campéas |
---|---|
date | Thu, 21 Sep 2017 17:06:16 +0200 |
parents | d1972a75c7d7 |
children | f91f780cb2e6 |
files | tests/test-topic-tutorial.t |
diffstat | 1 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic-tutorial.t Thu Sep 21 17:04:24 2017 +0200 +++ b/tests/test-topic-tutorial.t Thu Sep 21 17:06:16 2017 +0200 @@ -1514,7 +1514,8 @@ Solving this situation is easy with a topic: use merge or rebase. Merge within a multi-headed stack will use the other topic head as -destination if the topic has two heads. +destination if the topic has two heads. But rebasing will yield a +completely linear history so it's what we will do. $ hg log -G @ changeset: 21:f936c6da9d61 @@ -1751,10 +1752,6 @@ rebasing 20:bae3758e46bf "Adding drill" merging shopping - $ hg commit -m "Merge tools" - nothing changed - [1] - $ hg stack ### topic: tools ### branch: default, 2 behind