Mercurial > hg
view tests/test-diff-issue2761.t @ 14500:e880433a2e00 stable
localrepo: don't add deleted files to list of modified/added files (issue2761)
If a file is deleted (rm, not 'hg rm') from the working dir
an attempt to run 'hg diff -r X', with the file being present in X will
cause an abort.
We didn't check if the file has been deleted from the working dir
and later on tried to open it to compare with the one from X, causing the abort.
This fix adds that check. Consequently, no output will be returned.
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Mon, 11 Apr 2011 21:44:22 +0300 |
parents | |
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