Mercurial > hg
view tests/test-convert-hg-sink.out @ 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 | 68e0a55eee6e |
children |
line wrap: on
line source
changeset: 3:593cbf6fb2b4 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added tag some-tag for changeset ad681a868e44 changeset: 2:ad681a868e44 tag: some-tag user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: add foo/file changeset: 1:cbba8ecc03b7 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: remove foo changeset: 0:327daa9251fa user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: add foo and bar initializing destination new repository scanning source... sorting... converting... 3 add foo and bar 2 remove foo 1 add foo/file 0 Added tag some-tag for changeset ad681a868e44 comparing with ../orig searching for changes no changes found % dirstate should be empty: 3 files updated, 0 files merged, 0 files removed, 0 files unresolved % put something in the dirstate: a 0 -1 unset baz copy: bar -> baz % add a new revision in the original repo scanning source... sorting... converting... 0 add baz comparing with ../orig searching for changes no changes found % dirstate should be the same (no output below): % no copies 1 files updated, 0 files merged, 0 files removed, 0 files unresolved baz not renamed % test tag rewriting initializing destination new-filemap repository scanning source... sorting... converting... 4 add foo and bar 3 remove foo 2 add foo/file 1 Added tag some-tag for changeset ad681a868e44 0 add baz tip 2:6f4fd1df87fb some-tag 0:ba8636729451