Mercurial > hg

comparison tests/test-mq-git.out @ 10190:9c2c94934f0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: upgrade to git patch when necessary (issue767)
author Patrick Mezard <pmezard@gmail.com>
date Fri, 01 Jan 2010 21:21:34 +0100
parents
children 8cb81d75730c
comparison
equal deleted inserted replaced
10189:e451e599fbcf 10190:9c2c94934f0d
1 % git=auto: regular patch creation
2 # HG changeset patch
3 # Date 0 0
4
5 diff -r 000000000000 -r ef8dafc9fa4c a
6 --- /dev/null
7 +++ b/a
8 @@ -0,0 +1,1 @@
9 +a
10 % git=auto: git patch creation with copy
11 # HG changeset patch
12 # Date 0 0
13
14 diff --git a/a b/b
15 copy from a
16 copy to b
17 % git=auto: git patch when using --git
18 # HG changeset patch
19 # Date 0 0
20
21 diff --git a/regular b/regular
22 new file mode 100644
23 --- /dev/null
24 +++ b/regular
25 @@ -0,0 +1,1 @@
26 +regular
27 % git=auto: regular patch after qrefresh without --git
28 # HG changeset patch
29 # Date 0 0
30
31 diff -r 2962f232b49d regular
32 --- /dev/null
33 +++ b/regular
34 @@ -0,0 +1,1 @@
35 +regular
36 % git=keep: git patch with --git
37 # HG changeset patch
38 # Date 0 0
39
40 diff --git a/a b/a
41 new file mode 100644
42 --- /dev/null
43 +++ b/a
44 @@ -0,0 +1,1 @@
45 +a
46 % git=keep: git patch after qrefresh without --git
47 # HG changeset patch
48 # Date 0 0
49
50 diff --git a/a b/a
51 new file mode 100644
52 --- /dev/null
53 +++ b/a
54 @@ -0,0 +1,2 @@
55 +a
56 +a
57 % git=yes: git patch
58 # HG changeset patch
59 # Date 0 0
60
61 diff --git a/a b/a
62 new file mode 100644
63 --- /dev/null
64 +++ b/a
65 @@ -0,0 +1,1 @@
66 +a
67 % git=yes: git patch after qrefresh
68 # HG changeset patch
69 # Date 0 0
70
71 diff --git a/a b/a
72 new file mode 100644
73 --- /dev/null
74 +++ b/a
75 @@ -0,0 +1,2 @@
76 +a
77 +a
78 % git=no: regular patch with copy
79 # HG changeset patch
80 # Date 0 0
81
82 diff -r ef8dafc9fa4c -r 110cde11d262 b
83 --- /dev/null
84 +++ b/b
85 @@ -0,0 +1,1 @@
86 +a
87 % git=no: regular patch after qrefresh with copy
88 # HG changeset patch
89 # Date 0 0
90
91 diff -r ef8dafc9fa4c b
92 --- /dev/null
93 +++ b/b
94 @@ -0,0 +1,1 @@
95 +a
96 diff -r ef8dafc9fa4c c
97 --- /dev/null
98 +++ b/c
99 @@ -0,0 +1,1 @@
100 +a