Mercurial > hg

comparison tests/test-mq-merge.t @ 22521:3f948469bac0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: write '# Parent ' lines with two spaces like export does (BC) This aligns "Parent" node IDs with "Node ID" node IDs.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 24 Sep 2014 01:36:44 +0200
parents 9d4ebb75de53
children e955549cd045
comparison
equal deleted inserted replaced
22520:9d4ebb75de53 22521:3f948469bac0
136 136
137 Check patcha is still a git patch: 137 Check patcha is still a git patch:
138 138
139 $ cat .hg/patches/patcha 139 $ cat .hg/patches/patcha
140 # HG changeset patch 140 # HG changeset patch
141 # Parent d3873e73d99ef67873dac33fbcc66268d5d2b6f4 141 # Parent d3873e73d99ef67873dac33fbcc66268d5d2b6f4
142 142
143 diff --git a/a b/a 143 diff --git a/a b/a
144 --- a/a 144 --- a/a
145 +++ b/a 145 +++ b/a
146 @@ -1,1 +1,2 @@ 146 @@ -1,1 +1,2 @@
159 Check patcha2 is still a regular patch: 159 Check patcha2 is still a regular patch:
160 160
161 $ cat .hg/patches/patcha2 161 $ cat .hg/patches/patcha2
162 # HG changeset patch 162 # HG changeset patch
163 # Date 0 0 163 # Date 0 0
164 # Parent ???????????????????????????????????????? (glob) 164 # Parent ???????????????????????????????????????? (glob)
165 165
166 diff -r ???????????? -r ???????????? a (glob) 166 diff -r ???????????? -r ???????????? a (glob)
167 --- a/a 167 --- a/a
168 +++ b/a 168 +++ b/a
169 @@ -1,2 +1,3 @@ 169 @@ -1,2 +1,3 @@