1174 -That change will be committed |
1174 -That change will be committed |
1175 -That is the third line |
1175 -That is the third line |
1176 +That change will not be committed |
1176 +That change will not be committed |
1177 +That is the second line |
1177 +That is the second line |
1178 +That line has been added |
1178 +That line has been added |
|
1179 |
|
1180 Malformed patch - error handling |
|
1181 |
|
1182 $ cat > editor.sh << '__EOF__' |
|
1183 > sed -e '/^@/p' "$1" > tmp |
|
1184 > mv tmp "$1" |
|
1185 > __EOF__ |
|
1186 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF |
|
1187 > y |
|
1188 > e |
|
1189 > EOF |
|
1190 diff --git a/editedfile b/editedfile |
|
1191 1 hunks, 3 lines changed |
|
1192 examine changes to 'editedfile'? [Ynesfdaq?] |
|
1193 @@ -1,3 +1,3 @@ |
|
1194 -This is the first line |
|
1195 -This change will be committed |
|
1196 -This is the third line |
|
1197 +This change will not be committed |
|
1198 +This is the second line |
|
1199 +This line has been added |
|
1200 record this change to 'editedfile'? [Ynesfdaq?] |
|
1201 abort: error parsing patch: unhandled transition: range -> range |
|
1202 [255] |
|
1203 |
|
1204 $ cat > editor.sh << '__EOF__' |
|
1205 > sed -e '/^@/iother' "$1" > tmp |
|
1206 > mv tmp "$1" |
|
1207 > __EOF__ |
|
1208 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF |
|
1209 > y |
|
1210 > e |
|
1211 > EOF |
|
1212 diff --git a/editedfile b/editedfile |
|
1213 1 hunks, 3 lines changed |
|
1214 examine changes to 'editedfile'? [Ynesfdaq?] |
|
1215 @@ -1,3 +1,3 @@ |
|
1216 -This is the first line |
|
1217 -This change will be committed |
|
1218 -This is the third line |
|
1219 +This change will not be committed |
|
1220 +This is the second line |
|
1221 +This line has been added |
|
1222 record this change to 'editedfile'? [Ynesfdaq?] |
|
1223 abort: error parsing patch: unknown patch content: 'other\n' |
|
1224 [255] |
|
1225 |
1179 $ hg up -C |
1226 $ hg up -C |
1180 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1227 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1181 |
1228 |
1182 With win32text |
1229 With win32text |
1183 |
1230 |