Patchwork [1,of,3] histedit: add a testcase showing the obsolete cycle issue

login
register
mail settings
Submitter Jun Wu
Date March 26, 2017, 6:41 p.m.
Message ID <65636eb4a1e55f69daf6.1490553699@localhost.localdomain>
Download mbox | patch
Permalink /patch/19695/
State Deferred
Headers show

Comments

Jun Wu - March 26, 2017, 6:41 p.m.
# HG changeset patch
# User Jun Wu <quark@fb.com>
# Date 1490548029 25200
#      Sun Mar 26 10:07:09 2017 -0700
# Node ID 65636eb4a1e55f69daf6795a9ecad7a3da39108e
# Parent  e86eb75e74ce1b0803c26d86a229b9b711f6d76a
# Available At https://bitbucket.org/quark-zju/hg-draft
#              hg pull https://bitbucket.org/quark-zju/hg-draft -r 65636eb4a1e5
histedit: add a testcase showing the obsolete cycle issue

This revels the problem mentioned in [1], that if histedit --abort uses
obsolete markers, re-runing histedit will fail.

[1]: https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-March/095572.html

Patch

diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t
--- a/tests/test-histedit-obsolete.t
+++ b/tests/test-histedit-obsolete.t
@@ -550,2 +550,14 @@  Abort
   o  0:cb9a9f314b8b (public) a
   
+Re-run a similar histedit plan
+
+  $ hg histedit -r 'b449568bf7fc' --commands - << EOF
+  > pick b449568bf7fc 13 f
+  > pick 7395e1ff83bd 15 h
+  > pick 6b70183d2492 14 g
+  > pick b605fb7503f2 16 i
+  > pick 3a6c53ee7f3d 17 j
+  > pick ee118ab9fa44 18 k
+  > EOF
+  abort: 00changelog.i@4dc06258baa667440b8af3c849ddd9c10a4b0cb8: filtered node!
+  [255]