comparison tests/test-revert-interactive.t @ 27985:79139c7a88bd

revert: makes interactive mode ask to forget added files (issue4936) Before this patch revert interactive mode unconditionally forgets added files. This patch fixes this by asking user if he wants to forget added file. If user doesn't want to forget given file, it is added to matcher_opts exclude list, to not reviewing it later with other modified files.
author liscju <piotr.listkiewicz@gmail.com>
date Fri, 05 Feb 2016 15:18:40 +0100
parents dcc56e10c23b
children 14eee72c8d52
comparison
equal deleted inserted replaced
27984:e60e13a86529 27985:79139c7a88bd
13 $ cat <<EOF >> $HGRCPATH 13 $ cat <<EOF >> $HGRCPATH
14 > [ui] 14 > [ui]
15 > interactive = true 15 > interactive = true
16 > [extensions] 16 > [extensions]
17 > record = 17 > record =
18 > purge =
18 > EOF 19 > EOF
19 20
20 21
21 $ mkdir -p a/folder1 a/folder2 22 $ mkdir -p a/folder1 a/folder2
22 $ cd a 23 $ cd a
375 @@ -5,3 +5,4 @@ 376 @@ -5,3 +5,4 @@
376 4 377 4
377 5 378 5
378 d 379 d
379 +lastline 380 +lastline
381
382 $ hg update -C .
383 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
384 $ hg purge
385 $ touch newfile
386 $ hg add newfile
387 $ hg status
388 A newfile
389 $ hg revert -i <<EOF
390 > n
391 > EOF
392 forgetting newfile
393 forget added file newfile (yn)? n
394 $ hg status
395 A newfile
396 $ hg revert -i <<EOF
397 > y
398 > EOF
399 forgetting newfile
400 forget added file newfile (yn)? y
401 $ hg status
402 ? newfile
403