Mercurial > hg
view tests/test-diff-issue2761.t @ 15298:54c581d98636 stable
largefiles: test that merging does not result in wrong versions of largefiles
author | Na'Tosha Bard <natosha@unity3d.com> |
---|---|
date | Wed, 19 Oct 2011 17:40:27 +0200 |
parents | cff56a0ed18e |
children | 73e3e368bd42 |
line wrap: on
line source
Test issue2761 $ hg init $ touch to-be-deleted $ hg add adding to-be-deleted $ hg ci -m first $ echo a > to-be-deleted $ hg ci -m second $ rm to-be-deleted $ hg diff -r 0 Same issue, different code path $ hg up -C 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ touch doesnt-exist-in-1 $ hg add adding doesnt-exist-in-1 $ hg ci -m third $ rm doesnt-exist-in-1 $ hg diff -r 1