Patchwork test: ensure that 'hg update' is disabled while editing history with histedit (issue3655)

login
register
mail settings
Submitter Jason Gauci
Date April 11, 2016, 7:08 p.m.
Message ID <0BA43958-EF1B-41DB-9686-39C5485BD8EE@fb.com>
Download mbox | patch
Permalink /patch/14526/
State Accepted
Headers show

Comments

Jason Gauci - April 11, 2016, 7:08 p.m.
# HG changeset patch
# User Jason Gauci <jjg@fb.com>
# Date 1460401578 25200
#      Mon Apr 11 12:06:18 2016 -0700
# Node ID 1b7b8ced6798816e9f026b4249c39626cde09949
# Parent  c5565fc8848dd084d104ca40c33d1acdfcff8bc6
test: ensure that 'hg update' is disabled while editing history with histedit (issue3655)
Sean Farley - April 12, 2016, 8:17 p.m.
Jason Gauci <jjg@fb.com> writes:

> # HG changeset patch
> # User Jason Gauci <jjg@fb.com>
> # Date 1460401578 25200
> #      Mon Apr 11 12:06:18 2016 -0700
> # Node ID 1b7b8ced6798816e9f026b4249c39626cde09949
> # Parent  c5565fc8848dd084d104ca40c33d1acdfcff8bc6
> test: ensure that 'hg update' is disabled while editing history with histedit (issue3655)

Seems simple enough to me.
Matt Mackall - April 13, 2016, 9:17 p.m.
On Mon, 2016-04-11 at 19:08 +0000, Jason Gauci wrote:
> # HG changeset patch
> # User Jason Gauci <jjg@fb.com>
> # Date 1460401578 25200
> #      Mon Apr 11 12:06:18 2016 -0700
> # Node ID 1b7b8ced6798816e9f026b4249c39626cde09949
> # Parent  c5565fc8848dd084d104ca40c33d1acdfcff8bc6
> test: ensure that 'hg update' is disabled while editing history with histedit
> (issue3655)

Queued for default, thanks. Please check out either the patchbomb extension or
the pushgate described on the ContributingChanges page, accepting base64-encoded 
multipart messages with whitespace damage is a bit of a headache on our end.

-- 
Mathematics is the supreme nostalgia of our time.
Jason Gauci - April 13, 2016, 11:32 p.m.
Will do for the future, thanks.

Will your submission process automatically close issue 3655 or do I need to do anything on my end?




On 4/13/16, 2:17 PM, "Matt Mackall" <mpm@selenic.com> wrote:

>On Mon, 2016-04-11 at 19:08 +0000, Jason Gauci wrote:

>> # HG changeset patch

>> # User Jason Gauci <jjg@fb.com>

>> # Date 1460401578 25200

>> #      Mon Apr 11 12:06:18 2016 -0700

>> # Node ID 1b7b8ced6798816e9f026b4249c39626cde09949

>> # Parent  c5565fc8848dd084d104ca40c33d1acdfcff8bc6

>> test: ensure that 'hg update' is disabled while editing history with histedit

>> (issue3655)

>

>Queued for default, thanks. Please check out either the patchbomb extension or

>the pushgate described on the ContributingChanges page, accepting base64-encoded 

>multipart messages with whitespace damage is a bit of a headache on our end.

>

>-- 

>Mathematics is the supreme nostalgia of our time.

>
Matt Mackall - April 14, 2016, 12:27 a.m.
On Wed, 2016-04-13 at 23:32 +0000, Jason Gauci wrote:
> Will do for the future, thanks.
> 
> Will your submission process automatically close issue 3655 or do I need to do
> anything on my end?

It's automatic after the commit appears in the main repo:

https://bz.mercurial-scm.org/show_bug.cgi?id=3655#c6

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

@@ -77,6 +77,12 @@ 

   Editing (e860deea161a), you may commit or record as needed now.
   (hg histedit --continue to resume)

+try to update and get an error

+  $ hg update tip

+  abort: histedit in progress

+  (use 'hg histedit --continue' or 'hg histedit --abort')

+  [255]

+

 edit the plan via the editor
   $ cat >> $TESTTMP/editplan.sh <<EOF
   > cat > \$1 <<EOF2