Mercurial > hg-stable
view tests/test-unrelated-pull.out @ 10185:7637fe4f525d stable
mq: preserve --git flag when merging patches
Without this, merging a patch queue without diff.git=1 downgrades all git
patches to regular patches, losing data in the process.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 01 Jan 2010 19:53:05 +0100 |
parents | 8c4fd0de5de8 |
children | 4c94b6d0fb1c |
line wrap: on
line source
pulling from ../a searching for changes abort: repository is unrelated pulling from ../a searching for changes warning: repository is unrelated adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) changeset: 1:bdcee5d51fa6 tag: tip parent: -1:000000000000 user: a date: Mon Jan 12 13:46:40 1970 +0000 summary: a changeset: 0:f155ba1aa5ba user: b date: Mon Jan 12 13:46:40 1970 +0000 summary: b