Mercurial > hg
comparison tests/test-mq-qdiff.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 | a5b77eb0409b |
children | 2e8f4b82c551 |
comparison
equal
deleted
inserted
replaced
14499:a281981e2033 | 14500:e880433a2e00 |
---|---|
161 +a | 161 +a |
162 | 162 |
163 $ hg qdiff --stat | 163 $ hg qdiff --stat |
164 lines | 7 +++++-- | 164 lines | 7 +++++-- |
165 1 files changed, 5 insertions(+), 2 deletions(-) | 165 1 files changed, 5 insertions(+), 2 deletions(-) |
166 $ hg qrefresh | |
166 | 167 |
168 qdiff when file deleted (but not removed) in working dir: | |
169 | |
170 $ hg qnew deleted-file | |
171 $ echo a > newfile | |
172 $ hg add newfile | |
173 $ hg qrefresh | |
174 $ rm newfile | |
175 $ hg qdiff |