Mercurial > hg
view tests/test-mq-qfold.out @ 10186:296a0b14a686 stable 1.4.2
mq: preserve --git flag when folding patches
Without this, folding a git patch into a regular one downgrades the resulting
patch to a regular patch.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 01 Jan 2010 19:53:05 +0100 |
parents | 561ff8d9e4f0 |
children | 8cb81d75730c |
line wrap: on
line source
% init adding a % fold in the middle of the queue popping p3 popping p2 now at: p1 --- a/a +++ b/a @@ -1,1 +1,2 @@ a +a p1 p3 --- a/a +++ b/a @@ -1,1 +1,3 @@ a +a +b % fold with local changes abort: local changes found, refresh first --- a/a +++ b/a @@ -1,1 +1,3 @@ a +a +b reverting a % fold git patch into a regular patch, expect git patch popping git now at: regular diff --git a/a b/a --- a/a +++ b/a @@ -1,3 +1,4 @@ a a b +a diff --git a/a b/aa copy from a copy to aa --- a/a +++ b/aa @@ -1,3 +1,4 @@ a a b +a popping regular now at: p1 % fold regular patch into a git patch, expect git patch popping regular now at: git diff --git a/a b/aa copy from a copy to aa --- a/a +++ b/aa @@ -1,3 +1,4 @@ a a b +b