##// END OF EJS Templates
revert: ask user to confirm before tracking new file when interactive...
Martin von Zweigbergk -
r49896:3f6ef67e default
parent child Browse files
Show More
@@ -3752,6 +3752,12 b' def _performrevert('
3752 if f in newlyaddedandmodifiedfiles:
3752 if f in newlyaddedandmodifiedfiles:
3753 continue
3753 continue
3754
3754
3755 if interactive:
3756 choice = repo.ui.promptchoice(
3757 _(b"add new file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)
3758 )
3759 if choice != 0:
3760 continue
3755 prntstatusmsg(b'add', f)
3761 prntstatusmsg(b'add', f)
3756 checkout(f)
3762 checkout(f)
3757 repo.dirstate.set_tracked(f)
3763 repo.dirstate.set_tracked(f)
@@ -420,6 +420,19 b' 3) Use interactive revert with editing ('
420 forgetting newfile
420 forgetting newfile
421 $ hg status
421 $ hg status
422 ? newfile
422 ? newfile
423 $ rm newfile
424 $ hg up 0
425 1 files updated, 0 files merged, 4 files removed, 0 files unresolved
426 $ hg status
427 $ hg revert -r 2 -i <<EOF
428 > y
429 > n
430 > EOF
431 add new file folder1/g (Yn)? y
432 adding folder1/g
433 add new file folder2/h (Yn)? n
434 $ hg status
435 A folder1/g
423
436
424 When a line without EOL is selected during "revert -i" (issue5651)
437 When a line without EOL is selected during "revert -i" (issue5651)
425
438
General Comments 0
You need to be logged in to leave comments. Login now