Mercurial > public > mercurial-scm > hg-stable
diff tests/test-keyword.t @ 12844:a1b49b9a0328 stable
keyword: fix regressions introduced in d87f3ff904ba
- dirstate of overwritten files must be forced to normal
with kwexpand/kwshrink, not commit.
- recorded files must be weeded before overwriting.
- add test cases.
| author | Christian Ebert <blacktrash@gmx.net> |
|---|---|
| date | Sun, 24 Oct 2010 15:11:41 +0100 |
| parents | 8348599c68d7 |
| children | b00eda50ad2b |
line wrap: on
line diff
--- a/tests/test-keyword.t Mon Oct 25 23:55:43 2010 +0200 +++ b/tests/test-keyword.t Sun Oct 24 15:11:41 2010 +0100 @@ -440,6 +440,24 @@ $ hg update -C 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +record added keyword ignored file + + $ echo '$Id$' > i + $ hg add i + $ hg --verbose record -d '1 13' -m recignored<<EOF + > y + > EOF + diff --git a/i b/i + new file mode 100644 + examine changes to 'i'? [Ynsfdaq?] + i + committed changeset 3:5f40fe93bbdc + $ cat i + $Id$ + $ hg -q rollback + $ hg forget i + $ rm i + Test patch queue repo $ hg init --mq @@ -775,8 +793,12 @@ $ mkdir x $ hg copy a x/a + $ hg --verbose kwshrink a + overwriting a shrinking keywords + $ hg status a $ hg --verbose kwexpand a overwriting a expanding keywords + $ hg status a kwexpand x/a should abort