Patchwork histedit: support editing of the first commit (issue3767)

login
register
mail settings
Submitter Bryan O'Sullivan
Date April 12, 2013, 8:50 p.m.
Message ID <509d21fd9400410a3ca9.1365799804@australite.local>
Download mbox | patch
Permalink /patch/1287/
State Superseded
Commit 79580b3140cd7376c16395236ca24f36d2baa99c
Headers show

Comments

Bryan O'Sullivan - April 12, 2013, 8:50 p.m.
# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1365799591 25200
#      Fri Apr 12 13:46:31 2013 -0700
# Node ID 509d21fd9400410a3ca9a3f990e950164eb70357
# Parent  8d62a0fe6ee9b26c42ec0d6b0fe9812ba0f9ef31
histedit: support editing of the first commit (issue3767)
Bryan O'Sullivan - April 12, 2013, 9:19 p.m.
On Fri, Apr 12, 2013 at 2:15 PM, Kevin Bullock <
kbullock+mercurial@ringworld.org> wrote:

> So no code changes are needed to fix the bug?
>

Where'd mah diff go?

Patch

diff --git a/tests/test-histedit-edit.t b/tests/test-histedit-edit.t
--- a/tests/test-histedit-edit.t
+++ b/tests/test-histedit-edit.t
@@ -209,3 +209,16 @@  rollback should not work after a histedi
   [1]
 
   $ cd ..
+  $ hg clone -qr0 r r0
+  $ cd r0
+  $ echo edit cb9a9f314b8b a > $EDITED
+  $ hg phase -fdr0
+  $ HGEDITOR="cat \"$EDITED\" > " hg histedit 0 2>&1
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  adding a
+  abort: Make changes as needed, you may commit or record as needed now.
+  When you are finished, run hg histedit --continue to resume.
+  [255]
+  $ HGEDITOR=true hg histedit --continue
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-backup.hg (glob)