Mercurial > hg

comparison tests/test-mq-qfold.out @ 10186:296a0b14a686 stable 1.4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
10185:7637fe4f525d 10186:296a0b14a686
23 +++ b/a 23 +++ b/a
24 @@ -1,1 +1,3 @@ 24 @@ -1,1 +1,3 @@
25 a 25 a
26 +a 26 +a
27 +b 27 +b
28 reverting a
29 % fold git patch into a regular patch, expect git patch
30 popping git
31 now at: regular
32 diff --git a/a b/a
33 --- a/a
34 +++ b/a
35 @@ -1,3 +1,4 @@
36 a
37 a
38 b
39 +a
40 diff --git a/a b/aa
41 copy from a
42 copy to aa
43 --- a/a
44 +++ b/aa
45 @@ -1,3 +1,4 @@
46 a
47 a
48 b
49 +a
50 popping regular
51 now at: p1
52 % fold regular patch into a git patch, expect git patch
53 popping regular
54 now at: git
55 diff --git a/a b/aa
56 copy from a
57 copy to aa
58 --- a/a
59 +++ b/aa
60 @@ -1,3 +1,4 @@
61 a
62 a
63 b
64 +b