Mercurial > hg
view tests/test-diff-copy-depth @ 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 | 204a2ca249b6 |
children |
line wrap: on
line source
#!/bin/sh for i in aaa zzz; do hg init t cd t echo "-- With $i" touch file hg add file hg ci -m "Add" hg cp file $i hg ci -m "a -> $i" hg cp $i other-file echo "different" >> $i hg ci -m "$i -> other-file" hg cp other-file somename echo "Status": hg st -C echo echo "Diff:" hg diff -g echo cd .. rm -rf t done