Mercurial > hg

comparison tests/test-revert-interactive.t @ 29283:14eee72c8d52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: use "discard"/"revert" verb when reverting interactively (issue5143) Instead of "record this change to 'FILE'?" now prompt with: * "discard this change to 'FILE'?" when reverting to the parent of working directory, and, * "revert this change to 'FILE'?" otherwise.
author Denis Laxalde <denis.laxalde@logilab.fr>
date Fri, 03 Jun 2016 15:55:07 +0200
parents 79139c7a88bd
children 1b38cfde9530
comparison
equal deleted inserted replaced
29282:89822d7a9d5f 29283:14eee72c8d52
62 1 62 1
63 2 63 2
64 3 64 3
65 4 65 4
66 5 66 5
67 record change 1/6 to 'f'? [Ynesfdaq?] y 67 revert change 1/6 to 'f'? [Ynesfdaq?] y
68 68
69 @@ -1,5 +2,6 @@ 69 @@ -1,5 +2,6 @@
70 1 70 1
71 2 71 2
72 3 72 3
73 4 73 4
74 5 74 5
75 +b 75 +b
76 record change 2/6 to 'f'? [Ynesfdaq?] y 76 revert change 2/6 to 'f'? [Ynesfdaq?] y
77 77
78 diff --git a/folder1/g b/folder1/g 78 diff --git a/folder1/g b/folder1/g
79 2 hunks, 2 lines changed 79 2 hunks, 2 lines changed
80 examine changes to 'folder1/g'? [Ynesfdaq?] y 80 examine changes to 'folder1/g'? [Ynesfdaq?] y
81 81
84 1 84 1
85 2 85 2
86 3 86 3
87 4 87 4
88 5 88 5
89 record change 3/6 to 'folder1/g'? [Ynesfdaq?] y 89 revert change 3/6 to 'folder1/g'? [Ynesfdaq?] y
90 90
91 @@ -1,5 +2,6 @@ 91 @@ -1,5 +2,6 @@
92 1 92 1
93 2 93 2
94 3 94 3
95 4 95 4
96 5 96 5
97 +d 97 +d
98 record change 4/6 to 'folder1/g'? [Ynesfdaq?] n 98 revert change 4/6 to 'folder1/g'? [Ynesfdaq?] n
99 99
100 diff --git a/folder2/h b/folder2/h 100 diff --git a/folder2/h b/folder2/h
101 2 hunks, 2 lines changed 101 2 hunks, 2 lines changed
102 examine changes to 'folder2/h'? [Ynesfdaq?] n 102 examine changes to 'folder2/h'? [Ynesfdaq?] n
103 103
161 1 161 1
162 2 162 2
163 3 163 3
164 4 164 4
165 5 165 5
166 record change 1/6 to 'f'? [Ynesfdaq?] y 166 revert change 1/6 to 'f'? [Ynesfdaq?] y
167 167
168 @@ -1,5 +2,6 @@ 168 @@ -1,5 +2,6 @@
169 1 169 1
170 2 170 2
171 3 171 3
172 4 172 4
173 5 173 5
174 +b 174 +b
175 record change 2/6 to 'f'? [Ynesfdaq?] y 175 revert change 2/6 to 'f'? [Ynesfdaq?] y
176 176
177 diff --git a/folder1/g b/folder1/g 177 diff --git a/folder1/g b/folder1/g
178 2 hunks, 2 lines changed 178 2 hunks, 2 lines changed
179 examine changes to 'folder1/g'? [Ynesfdaq?] y 179 examine changes to 'folder1/g'? [Ynesfdaq?] y
180 180
183 1 183 1
184 2 184 2
185 3 185 3
186 4 186 4
187 5 187 5
188 record change 3/6 to 'folder1/g'? [Ynesfdaq?] y 188 revert change 3/6 to 'folder1/g'? [Ynesfdaq?] y
189 189
190 @@ -1,5 +2,6 @@ 190 @@ -1,5 +2,6 @@
191 1 191 1
192 2 192 2
193 3 193 3
194 4 194 4
195 5 195 5
196 +d 196 +d
197 record change 4/6 to 'folder1/g'? [Ynesfdaq?] n 197 revert change 4/6 to 'folder1/g'? [Ynesfdaq?] n
198 198
199 diff --git a/folder2/h b/folder2/h 199 diff --git a/folder2/h b/folder2/h
200 2 hunks, 2 lines changed 200 2 hunks, 2 lines changed
201 examine changes to 'folder2/h'? [Ynesfdaq?] n 201 examine changes to 'folder2/h'? [Ynesfdaq?] n
202 202
240 1 240 1
241 2 241 2
242 3 242 3
243 4 243 4
244 5 244 5
245 record change 1/2 to 'f'? [Ynesfdaq?] y 245 discard change 1/2 to 'f'? [Ynesfdaq?] y
246 246
247 @@ -2,6 +1,5 @@ 247 @@ -2,6 +1,5 @@
248 1 248 1
249 2 249 2
250 3 250 3
251 4 251 4
252 5 252 5
253 -b 253 -b
254 record change 2/2 to 'f'? [Ynesfdaq?] n 254 discard change 2/2 to 'f'? [Ynesfdaq?] n
255 255
256 $ hg st 256 $ hg st
257 M f 257 M f
258 M folder1/g 258 M folder1/g
259 R folder1/i 259 R folder1/i
301 301
302 @@ -1,1 +1,2 @@ 302 @@ -1,1 +1,2 @@
303 -1 303 -1
304 +0 304 +0
305 +2 305 +2
306 record this change to 'k'? [Ynesfdaq?] e 306 discard this change to 'k'? [Ynesfdaq?] e
307 307
308 $ cat k 308 $ cat k
309 42 309 42
310 310
311 Check the experimental config to invert the selection: 311 Check the experimental config to invert the selection:
348 -firstline 348 -firstline
349 c 349 c
350 1 350 1
351 2 351 2
352 3 352 3
353 record change 1/3 to 'folder1/g'? [Ynesfdaq?] y 353 discard change 1/3 to 'folder1/g'? [Ynesfdaq?] y
354 354
355 @@ -2,7 +1,7 @@ 355 @@ -2,7 +1,7 @@
356 c 356 c
357 1 357 1
358 2 358 2
359 3 359 3
360 - 3 360 - 3
361 +4 361 +4
362 5 362 5
363 d 363 d
364 record change 2/3 to 'folder1/g'? [Ynesfdaq?] y 364 discard change 2/3 to 'folder1/g'? [Ynesfdaq?] y
365 365
366 @@ -7,3 +6,2 @@ 366 @@ -7,3 +6,2 @@
367 5 367 5
368 d 368 d
369 -lastline 369 -lastline
370 record change 3/3 to 'folder1/g'? [Ynesfdaq?] n 370 discard change 3/3 to 'folder1/g'? [Ynesfdaq?] n
371 371
372 $ hg diff --nodates 372 $ hg diff --nodates
373 diff -r a3d963a027aa folder1/g 373 diff -r a3d963a027aa folder1/g
374 --- a/folder1/g 374 --- a/folder1/g
375 +++ b/folder1/g 375 +++ b/folder1/g