comparison tests/test-topic-stack-complex.t @ 4356:a71f2271ed76 mercurial-4.8

branching: merge with future version
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 22 Jan 2019 10:46:02 -0500
parents 8974a05a49fa
children 522abf1d70b7 5da1d162ad50
comparison
equal deleted inserted replaced
4355:75db6a9d0b54 4356:a71f2271ed76
61 61
62 $ hg split << EOF 62 $ hg split << EOF
63 > y 63 > y
64 > y 64 > y
65 > n 65 > n
66 > y 66 > c
67 > EOF 67 > EOF
68 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 68 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
69 adding c 69 adding c
70 adding d 70 adding d
71 diff --git a/c b/c 71 diff --git a/c b/c
78 78
79 diff --git a/d b/d 79 diff --git a/d b/d
80 new file mode 100644 80 new file mode 100644
81 examine changes to 'd'? [Ynesfdaq?] n 81 examine changes to 'd'? [Ynesfdaq?] n
82 82
83 Done splitting? [yN] y 83 continue splitting? [Ycdq?] c
84 1 new orphan changesets 84 1 new orphan changesets
85 85
86 $ hg stack 86 $ hg stack
87 ### topic: foo 87 ### topic: foo
88 ### target: default (branch) 88 ### target: default (branch)