##// END OF EJS Templates
mq: upgrade non-plain patches to HG format when setting parent in patchheader...
Mads Kiilerich -
r22545:6a2cfa61 default
parent child Browse files
Show More
@@ -241,7 +241,9 b' class patchheader(object):'
241 patchheaderat = self.comments.index('# HG changeset patch')
241 patchheaderat = self.comments.index('# HG changeset patch')
242 self.comments.insert(patchheaderat + 1, '# Parent ' + parent)
242 self.comments.insert(patchheaderat + 1, '# Parent ' + parent)
243 except ValueError:
243 except ValueError:
244 pass
244 if not self.plainmode:
245 tmp = ['# HG changeset patch', '# Parent ' + parent]
246 self.comments = tmp + self.comments
245 self.parent = parent
247 self.parent = parent
246
248
247 def setmessage(self, message):
249 def setmessage(self, message):
@@ -84,6 +84,8 b' force LF'
84 now at: eol.diff
84 now at: eol.diff
85 $ hg qrefresh
85 $ hg qrefresh
86 $ python ../cateol.py .hg/patches/eol.diff
86 $ python ../cateol.py .hg/patches/eol.diff
87 # HG changeset patch<LF>
88 # Parent 0d0bf99a8b7a3842c6f8ef09e34f69156c4bd9d0<LF>
87 test message<LF>
89 test message<LF>
88 <LF>
90 <LF>
89 diff -r 0d0bf99a8b7a a<LF>
91 diff -r 0d0bf99a8b7a a<LF>
@@ -23,7 +23,7 b' test qpush on empty series'
23 $ echo bar > bar
23 $ echo bar > bar
24 $ hg add bar
24 $ hg add bar
25 $ hg qrefresh -m 'patch 2'
25 $ hg qrefresh -m 'patch 2'
26 $ hg qnew --config 'mq.plain=true' bad-patch
26 $ hg qnew --config 'mq.plain=true' -U bad-patch
27 $ echo >> foo
27 $ echo >> foo
28 $ hg qrefresh
28 $ hg qrefresh
29 $ hg qpop -a
29 $ hg qpop -a
General Comments 0
You need to be logged in to leave comments. Login now