Mercurial > hg
view tests/test-addremove @ 11965:77f1f206e135 stable
mq: don't inherit default and default-push paths with --mq (issue2333)
Configuration from the outer repo is inherited to the patches repo when --mq is
used.
In case the patches repo only has paths.default configured but the outer repo
has paths.default-push then the inherited default-push will win. Very
confusing.
Inheriting the default paths is however wrong in all sane cases, so now we
explicitly remove them.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 18 Aug 2010 02:43:45 +0200 |
parents | 627399330c7d |
children |
line wrap: on
line source
#!/bin/sh hg init rep cd rep mkdir dir touch foo dir/bar hg -v addremove hg -v commit -m "add 1" -d "1000000 0" cd dir/ touch ../foo_2 bar_2 hg -v addremove hg -v commit -m "add 2" -d "1000000 0" cd .. hg init sim cd sim echo a > a echo a >> a echo a >> a echo c > c hg commit -Ama mv a b rm c echo d > d hg addremove -n -s 50 # issue 1696 hg addremove -s 50 hg commit -mb