Mercurial > hg
view tests/test-issue1089.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 | 4441705b7111 |
children | 55c6ebd11cb9 |
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 $ 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 $ cd b Relative delete: $ hg ci -m m ../a $ cd ..