Mercurial > evolve

comparison tests/test-evolve-orphan-split.t @ 4356:a71f2271ed76 mercurial-4.8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a2fdbece7ce1 159a4a6ded0b
comparison
equal deleted inserted replaced
4355:75db6a9d0b54 4356:a71f2271ed76
39 39
40 $ hg split -r 1 <<EOF 40 $ hg split -r 1 <<EOF
41 > y 41 > y
42 > y 42 > y
43 > n 43 > n
44 > y 44 > c
45 > EOF 45 > EOF
46 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 46 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
47 adding a 47 adding a
48 adding b 48 adding b
49 diff --git a/a b/a 49 diff --git a/a b/a
57 diff --git a/b b/b 57 diff --git a/b b/b
58 new file mode 100644 58 new file mode 100644
59 examine changes to 'b'? [Ynesfdaq?] n 59 examine changes to 'b'? [Ynesfdaq?] n
60 60
61 created new head 61 created new head
62 Done splitting? [yN] y 62 continue splitting? [Ycdq?] c
63 1 new orphan changesets 63 1 new orphan changesets
64 64
65 $ hg glog 65 $ hg glog
66 @ 4:8b179cffc81c added a and b 66 @ 4:8b179cffc81c added a and b
67 | () draft 67 | () draft
119 > n 119 > n
120 > y 120 > y
121 > y 121 > y
122 > y 122 > y
123 > y 123 > y
124 > y 124 > c
125 > EOF 125 > EOF
126 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 126 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
127 adding a 127 adding a
128 adding b 128 adding b
129 adding c 129 adding c
150 @@ -0,0 +1,1 @@ 150 @@ -0,0 +1,1 @@
151 +foo 151 +foo
152 record change 3/3 to 'c'? [Ynesfdaq?] y 152 record change 3/3 to 'c'? [Ynesfdaq?] y
153 153
154 created new head 154 created new head
155 Done splitting? [yN] y 155 continue splitting? [Ycdq?] c
156 1 new orphan changesets 156 1 new orphan changesets
157 157
158 $ hg glog 158 $ hg glog
159 @ 9:c0fbf8aaf6c4 added a b c 159 @ 9:c0fbf8aaf6c4 added a b c
160 | () draft 160 | () draft