Mercurial > hg
view tests/test-issue1089.t @ 44459:6f1f4a6f4168
copies-tests: add a case where a file is deleted/added but with a merge
This is a case similar to DB/BD, but in this case the other branch updated the
file. So an actual merge happens and the two "independant" file history has to
be merged.
Differential Revision: https://phab.mercurial-scm.org/D8241
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 03 Mar 2020 15:46:28 +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 ..