equal
deleted
inserted
replaced
1037 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1037 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1038 |
1038 |
1039 Editing patch (and ignoring trailing text) |
1039 Editing patch (and ignoring trailing text) |
1040 |
1040 |
1041 $ cat > editor.sh << '__EOF__' |
1041 $ cat > editor.sh << '__EOF__' |
1042 > sed -e 7d -e '5s/^-/ /' -e '/^# ---/itrailing\nditto' "$1" > tmp |
1042 > sed -e 7d -e '5s/^-/ /' -e '/^# ---/i\ |
|
1043 > trailing\nditto' "$1" > tmp |
1043 > mv tmp "$1" |
1044 > mv tmp "$1" |
1044 > __EOF__ |
1045 > __EOF__ |
1045 $ cat > editedfile << '__EOF__' |
1046 $ cat > editedfile << '__EOF__' |
1046 > This is the first line |
1047 > This is the first line |
1047 > This is the second line |
1048 > This is the second line |
1202 [255] |
1203 [255] |
1203 |
1204 |
1204 random text in random positions is still an error |
1205 random text in random positions is still an error |
1205 |
1206 |
1206 $ cat > editor.sh << '__EOF__' |
1207 $ cat > editor.sh << '__EOF__' |
1207 > sed -e '/^@/iother' "$1" > tmp |
1208 > sed -e '/^@/i\ |
|
1209 > other' "$1" > tmp |
1208 > mv tmp "$1" |
1210 > mv tmp "$1" |
1209 > __EOF__ |
1211 > __EOF__ |
1210 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF |
1212 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF |
1211 > y |
1213 > y |
1212 > e |
1214 > e |