Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
12843:8aeb6184b008 | 12844:a1b49b9a0328 |
---|---|
438 $ hg forget r | 438 $ hg forget r |
439 $ rm msg r | 439 $ rm msg r |
440 $ hg update -C | 440 $ hg update -C |
441 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 441 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
442 | 442 |
443 record added keyword ignored file | |
444 | |
445 $ echo '$Id$' > i | |
446 $ hg add i | |
447 $ hg --verbose record -d '1 13' -m recignored<<EOF | |
448 > y | |
449 > EOF | |
450 diff --git a/i b/i | |
451 new file mode 100644 | |
452 examine changes to 'i'? [Ynsfdaq?] | |
453 i | |
454 committed changeset 3:5f40fe93bbdc | |
455 $ cat i | |
456 $Id$ | |
457 $ hg -q rollback | |
458 $ hg forget i | |
459 $ rm i | |
460 | |
443 Test patch queue repo | 461 Test patch queue repo |
444 | 462 |
445 $ hg init --mq | 463 $ hg init --mq |
446 $ hg qimport -r tip -n mqtest.diff | 464 $ hg qimport -r tip -n mqtest.diff |
447 $ hg commit --mq -m mqtest | 465 $ hg commit --mq -m mqtest |
773 | 791 |
774 kwexpand/kwshrink on selected files | 792 kwexpand/kwshrink on selected files |
775 | 793 |
776 $ mkdir x | 794 $ mkdir x |
777 $ hg copy a x/a | 795 $ hg copy a x/a |
796 $ hg --verbose kwshrink a | |
797 overwriting a shrinking keywords | |
798 $ hg status a | |
778 $ hg --verbose kwexpand a | 799 $ hg --verbose kwexpand a |
779 overwriting a expanding keywords | 800 overwriting a expanding keywords |
801 $ hg status a | |
780 | 802 |
781 kwexpand x/a should abort | 803 kwexpand x/a should abort |
782 | 804 |
783 $ hg --verbose kwexpand x/a | 805 $ hg --verbose kwexpand x/a |
784 abort: outstanding uncommitted changes | 806 abort: outstanding uncommitted changes |