view tests/test-issue1089.t @ 16792:ad394c897b16

merge: do not warn about copy and rename in the same transaction (issue2113)
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 23 May 2012 17:25:48 +0200
parents 9910f60a37ee
children f2719b387380
line wrap: on
line source

http://mercurial.selenic.com/bts/issue1089

  $ 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