equal
deleted
inserted
replaced
449 $ cat > ../edit.sh <<EOF |
449 $ cat > ../edit.sh <<EOF |
450 > cat "\$1" | sed s/pick/fold/ > tmp |
450 > cat "\$1" | sed s/pick/fold/ > tmp |
451 > mv tmp "\$1" |
451 > mv tmp "\$1" |
452 > EOF |
452 > EOF |
453 $ HGEDITOR="sh ../edit.sh" hg histedit 2 |
453 $ HGEDITOR="sh ../edit.sh" hg histedit 2 |
454 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
455 reverting a |
|
456 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
457 warning: histedit rules saved to: .hg/histedit-last-edit.txt |
454 warning: histedit rules saved to: .hg/histedit-last-edit.txt |
458 abort: cannot fold into public change 18aa70c8ad22 |
455 abort: cannot fold into public change 18aa70c8ad22 |
459 [255] |
456 [255] |
460 $ cat .hg/histedit-last-edit.txt |
457 $ cat .hg/histedit-last-edit.txt |
461 fold 0012be4a27ea 2 extend a |
458 fold 0012be4a27ea 2 extend a |
470 # f, fold = use commit, but combine it with the one above |
467 # f, fold = use commit, but combine it with the one above |
471 # r, roll = like fold, but discard this commit's description |
468 # r, roll = like fold, but discard this commit's description |
472 # d, drop = remove commit from history |
469 # d, drop = remove commit from history |
473 # m, mess = edit commit message without changing commit content |
470 # m, mess = edit commit message without changing commit content |
474 # |
471 # |
475 TODO: this abort shouldn't be required, but it is for now to leave the repo in |
|
476 a clean state. |
|
477 $ hg histedit --abort |
|