view tests/test-revert-unknown.t @ 27163:27b89a0957ec

filemerge: add a 'leave unresolved' option to change/delete prompts We're going to make this option the default in an upcoming patch.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 30 Nov 2015 13:43:55 -0800
parents 4c94b6d0fb1c
children 5c2a4f37eace
line wrap: on
line source

  $ hg init
  $ touch unknown

  $ touch a
  $ hg add a
  $ hg ci -m "1"

  $ touch b
  $ hg add b
  $ hg ci -m "2"

Should show unknown

  $ hg status
  ? unknown
  $ hg revert -r 0 --all
  removing b

Should show unknown and b removed

  $ hg status
  R b
  ? unknown

Should show a and unknown

  $ ls
  a
  unknown