Mercurial > evolve

comparison tests/test-grab.t @ 3935:9af0e2b0bdd7 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Aug 2018 00:19:47 +0200
parents d5adce52cef4
children f9a850018daa
comparison
equal deleted inserted replaced
3934:d55a6fef9eb9 3935:9af0e2b0bdd7
104 104
105 Grabbing a revision 105 Grabbing a revision
106 106
107 $ hg grab 7c3bad9141dc 107 $ hg grab 7c3bad9141dc
108 grabbing 1:7c3bad9141dc "add b" 108 grabbing 1:7c3bad9141dc "add b"
109 1 new orphan changesets
110 $ hg glog 109 $ hg glog
111 @ 5:7c15c05db6fa add b 110 @ 5:7c15c05db6fa add b
112 | 111 |
113 o 4:d46dc301d92f add y 112 o 4:d46dc301d92f add y
114 | 113 |
115 o 3:8e224524cd09 add x 114 o 3:8e224524cd09 add x
116 | 115 |
117 | * 2:4538525df7e2 add c 116 | o 2:4538525df7e2 add c
118 | | 117 | |
119 | x 1:7c3bad9141dc add b 118 | x 1:7c3bad9141dc add b
120 |/ 119 |/
121 o 0:1f0dee641bb7 add a 120 o 0:1f0dee641bb7 add a
122 121
133 | 132 |
134 o 4:d46dc301d92f add y 133 o 4:d46dc301d92f add y
135 | 134 |
136 o 3:8e224524cd09 add x 135 o 3:8e224524cd09 add x
137 | 136 |
138 | * 2:4538525df7e2 add c 137 | o 2:4538525df7e2 add c
139 | | 138 | |
140 | x 1:7c3bad9141dc add b 139 | x 1:7c3bad9141dc add b
141 |/ 140 |/
142 o 0:1f0dee641bb7 add a 141 o 0:1f0dee641bb7 add a
143 142
217 Testing the abort functionality of hg grab 216 Testing the abort functionality of hg grab
218 217
219 $ echo foo > b 218 $ echo foo > b
220 $ hg ci -Aqm "foo to b" 219 $ hg ci -Aqm "foo to b"
221 $ hg glog -r .^:: 220 $ hg glog -r .^::
222 @ 10:c437988de89f foo to b 221 hg: parse error at 4: not a prefix: end
223 | 222 [255]
224 o 8:44e155eb95c7 add c
225 |
226 ~
227 223
228 $ hg grab -r 7c15c05db6fa 224 $ hg grab -r 7c15c05db6fa
229 grabbing 5:7c15c05db6fa "add b" 225 grabbing 5:7c15c05db6fa "add b"
230 merging b 226 merging b
231 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 227 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')