view tests/test-backwards-remove.t @ 16795:e9ae770eff1c

merge: show renamed on one and deleted on the other side in debug output
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 23 May 2012 21:34:29 +0200
parents 4c94b6d0fb1c
children 5c2a4f37eace
line wrap: on
line source

  $ hg init
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ ls
  a
  $ echo This is file b1 > b
  $ hg add b
  $ hg commit -m "commit #1"
  $ hg co 0
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

B should disappear

  $ ls
  a