Mercurial > hg
view tests/test-status.out @ 6179:36ab165abbe2
patch: fix iterhunks() with trailing binary file removal
Like some renames or copy operations, binary file removal does not generate any
"file" or "hunk" action, but was not tagged as such and let iterhunk() assume
no hunk was applied for the deleted file.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Thu, 28 Feb 2008 00:07:37 +0100 |
parents | cfb4a51da7d5 |
children | acc40572da5b |
line wrap: on
line source
hg status in repo root: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in repo root: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status in a: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in a: ? 1/in_a_1 ? in_a hg status .. in a: ? 1/in_a_1 ? in_a ? ../b/1/in_b_1 ? ../b/2/in_b_2 ? ../b/in_b ? ../in_root hg status in b: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in b: ? 1/in_b_1 ? 2/in_b_2 ? in_b hg status .. in b: ? ../a/1/in_a_1 ? ../a/in_a ? 1/in_b_1 ? 2/in_b_2 ? in_b ? ../in_root hg status in a/1: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in a/1: ? in_a_1 hg status .. in a/1: ? in_a_1 ? ../in_a hg status in b/1: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in b/1: ? in_b_1 hg status .. in b/1: ? in_b_1 ? ../2/in_b_2 ? ../in_b hg status in b/2: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in b/2: ? in_b_2 hg status .. in b/2: ? ../1/in_b_1 ? in_b_2 ? ../in_b adding .hgignore adding deleted adding modified adding removed hg status: A added R removed ! deleted ? unknown hg status modified added removed deleted unknown never-existed ignored: never-existed: No such file or directory A added R removed ! deleted ? unknown hg status -C: A added A copied modified R removed ! deleted ? unknown hg status -A: A added A copied modified R removed ! deleted ? unknown I ignored C .hgignore C modified hg status ignoreddir/file: hg status -i ignoreddir/file: I ignoreddir/file