Mercurial > hg
view tests/test-586 @ 11252:56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Before this bugfix a file whose changes were entirely recorded was still
considered modified by "hg status".
Note: the test must use hg record -l/--logfile, because this is not
reproducible with hg record -m/--message.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Tue, 01 Jun 2010 01:05:45 +0200 |
parents | f1af59451c0c |
children |
line wrap: on
line source
#!/bin/sh # a test for issue586 hg init a cd a echo a > a hg ci -Ama hg init ../b cd ../b echo b > b hg ci -Amb hg pull -f ../a hg merge hg rm -f a hg ci -Amc hg st -A cd .. # a test for issue 1433, related to issue586 echo % create test repos hg init repoa touch repoa/a hg -R repoa ci -Am adda hg init repob touch repob/b hg -R repob ci -Am addb hg init repoc cd repoc hg pull ../repoa hg update mkdir tst hg mv * tst hg ci -m "import a in tst" hg pull -f ../repob echo % merge both repos hg merge mkdir src echo % move b content hg mv b src hg ci -m "import b in src" hg manifest