--- a/tests/test-topic-dest.t Wed Oct 21 01:12:32 2015 +0200
+++ b/tests/test-topic-dest.t Wed Oct 21 01:09:15 2015 +0200
@@ -91,3 +91,66 @@
$ hg log -r 'ngtip(.)'
6 () c_epsilon
+merge destination
+=================
+
+ $ hg up 'ngtip(default)'
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ echo zeta >> zeta
+ $ hg add zeta
+ $ hg ci -m "c_zeta"
+ created new head
+ $ hg log -G
+ @ 9 () c_zeta
+ |
+ | o 8 (monkey) zephir
+ |/
+ | o 7 (elephant) babar
+ |/
+ o 6 () c_epsilon
+ |
+ o 3 () c_delta
+ |
+ o 2 () c_gamma
+ |
+ o 1 () c_beta
+ |
+ o 0 () c_alpha
+
+ $ hg up elephant
+ switching to topic elephant
+ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ hg rebase # make sure tip is elsewhere
+ rebasing 7:8d0b77140b05 "babar"
+ $ hg up monkey
+ switching to topic monkey
+ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ hg merge
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
+ $ hg topic
+ elephant
+ * monkey
+ $ hg ci -m 'merge with default'
+ $ hg topic
+ elephant
+ * monkey
+ $ hg log -G
+ @ 11 (monkey) merge with default
+ |\
+ | | o 10 (elephant) babar
+ | |/
+ | o 9 () c_zeta
+ | |
+ o | 8 (monkey) zephir
+ |/
+ o 6 () c_epsilon
+ |
+ o 3 () c_delta
+ |
+ o 2 () c_gamma
+ |
+ o 1 () c_beta
+ |
+ o 0 () c_alpha
+