Mercurial > hg-stable
view tests/test-branchmap.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 | 7bb004fc14ec |
children | 3a69afd6987e |
line wrap: on
line source
marked working directory as branch æ adding foo listening at http://localhost/ (bound to 127.0.0.1) requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files updating to branch æ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 0:867c11ce77b8 branch: æ tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: foo pushing to http://localhost:PORT searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files changeset: 1:58e7c90d67cb branch: æ tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: bar changeset: 0:867c11ce77b8 branch: æ user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: foo pushing to ssh://dummy/ searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files