equal
deleted
inserted
replaced
318 2 |
318 2 |
319 3 |
319 3 |
320 4 |
320 4 |
321 5 |
321 5 |
322 b |
322 b |
|
323 |
|
324 Check the experimental config to invert the selection: |
|
325 $ cat <<EOF >> $HGRCPATH |
|
326 > [experimental] |
|
327 > revertalternateinteractivemode=True |
|
328 > EOF |
|
329 |
|
330 |
|
331 $ hg up -C . |
|
332 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
333 $ printf 'firstline\nc\n1\n2\n3\n 3\n5\nd\nlastline\n' > folder1/g |
|
334 $ hg diff --nodates |
|
335 diff -r 5a858e056dc0 folder1/g |
|
336 --- a/folder1/g |
|
337 +++ b/folder1/g |
|
338 @@ -1,7 +1,9 @@ |
|
339 +firstline |
|
340 c |
|
341 1 |
|
342 2 |
|
343 3 |
|
344 -4 |
|
345 + 3 |
|
346 5 |
|
347 d |
|
348 +lastline |
|
349 $ hg revert -i <<EOF |
|
350 > y |
|
351 > y |
|
352 > y |
|
353 > n |
|
354 > EOF |
|
355 reverting folder1/g (glob) |
|
356 diff --git a/folder1/g b/folder1/g |
|
357 3 hunks, 3 lines changed |
|
358 examine changes to 'folder1/g'? [Ynesfdaq?] y |
|
359 |
|
360 @@ -1,4 +1,5 @@ |
|
361 +firstline |
|
362 c |
|
363 1 |
|
364 2 |
|
365 3 |
|
366 record change 1/3 to 'folder1/g'? [Ynesfdaq?] y |
|
367 |
|
368 @@ -1,7 +2,7 @@ |
|
369 c |
|
370 1 |
|
371 2 |
|
372 3 |
|
373 -4 |
|
374 + 3 |
|
375 5 |
|
376 d |
|
377 record change 2/3 to 'folder1/g'? [Ynesfdaq?] y |
|
378 |
|
379 @@ -6,2 +7,3 @@ |
|
380 5 |
|
381 d |
|
382 +lastline |
|
383 record change 3/3 to 'folder1/g'? [Ynesfdaq?] n |
|
384 |
|
385 $ hg diff --nodates |
|
386 diff -r 5a858e056dc0 folder1/g |
|
387 --- a/folder1/g |
|
388 +++ b/folder1/g |
|
389 @@ -5,3 +5,4 @@ |
|
390 4 |
|
391 5 |
|
392 d |
|
393 +lastline |