Mercurial > hg
diff tests/test-mq-merge.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 | 561ff8d9e4f0 |
children | 8cb81d75730c |
line wrap: on
line diff
--- a/tests/test-mq-merge.out Fri Jan 01 19:53:05 2010 +0100 +++ b/tests/test-mq-merge.out Fri Jan 01 19:53:05 2010 +0100 @@ -18,8 +18,35 @@ adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % create the reference queue -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 1 files removed, 0 files unresolved % merge merging with queue at refqueue applying patcha -now at: patcha +patching file a +Hunk #1 FAILED at 0 +1 out of 1 hunks FAILED -- saving rejects to file a.rej +patch failed, unable to continue (try -v) +patch failed, rejects left in working dir +patch didn't work out, merging patcha +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +0 files updated, 2 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +applying patcha2 +now at: patcha2 +% check patcha is still a git patch +diff --git a/a b/a +--- a/a ++++ b/a +@@ -1,1 +1,2 @@ +-b ++a ++c +diff --git a/a b/aa +copy from a +copy to aa +--- a/a ++++ b/aa +@@ -1,1 +1,1 @@ +-b ++a +% check patcha2 is still a regular patch