view tests/test-issue1089.t @ 27077:ca3fbf9dad8c

mergestate: add a function to return the number of unresolved files Note that unlike the other functions, this is based on the persistent mergestate.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 20 Nov 2015 16:18:51 -0800
parents 2fc86d92c4a9
children 4441705b7111
line wrap: on
line source

https://bz.mercurial-scm.org/1089

  $ hg init
  $ mkdir a
  $ echo a > a/b
  $ hg ci -Am m
  adding a/b

  $ hg rm a
  removing a/b (glob)
  $ hg ci -m m a

  $ mkdir a b
  $ echo a > a/b
  $ hg ci -Am m
  adding a/b

  $ hg rm a
  removing a/b (glob)
  $ cd b

Relative delete:

  $ hg ci -m m ../a

  $ cd ..