comparison tests/test-import.t @ 22278:ffaaa80fa724

import: avoid editor invocation when importing with "--exact" for exact-ness Before this patch, external editor is invoked when imported patch has no commit message, even if "--exact" is specified. Then, exact-ness is broken, because empty commit message causes failure of committing. This patch avoids editor invocation at importing with "--exact" for exact-ness, because commit message in the patch should be kept as it is in such case, even if it is empty.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 23 Aug 2014 23:03:50 +0900
parents f3200bf460a8
children d7cedb32a8ab
comparison
equal deleted inserted replaced
22277:e116abad3afa 22278:ffaaa80fa724
105 HG: user: test 105 HG: user: test
106 HG: branch 'default' 106 HG: branch 'default'
107 HG: changed a 107 HG: changed a
108 abort: empty commit message 108 abort: empty commit message
109 [255] 109 [255]
110
111 Test avoiding editor invocation at applying the patch with --exact,
112 even if commit message is empty
113
114 $ echo a >> b/a
115 $ hg --cwd b commit -m ' '
116 $ hg --cwd b tip -T "{node}\n"
117 d8804f3f5396d800812f579c8452796a5993bdb2
118 $ hg --cwd b export -o ../empty-log.diff .
119 $ hg --cwd b update -q -C ".^1"
120 $ hg --cwd b --config extensions.strip= strip -q tip
121 $ HGEDITOR=cat hg --cwd b import --exact ../empty-log.diff
122 applying ../empty-log.diff
123 $ hg --cwd b tip -T "{node}\n"
124 d8804f3f5396d800812f579c8452796a5993bdb2
125
110 $ rm -r b 126 $ rm -r b
111 127
112 128
113 import of plain diff should be ok with message 129 import of plain diff should be ok with message
114 130