view tests/test-backwards-remove.t @ 46160:1d6aac94e6d5

copies: explain the "arbitrary" copy source pick in case of conflict They are a logic and it is easy to explain, so lets explain it. Differential Revision: https://phab.mercurial-scm.org/D9586
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 13 Dec 2020 19:18:10 +0100
parents 5c2a4f37eace
children 55c6ebd11cb9
line wrap: on
line source

  $ hg init
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ ls -A
  .hg
  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
  .hg
  a