Patchwork [2,of,2,evolve-ext] test: update with new graft output

login
register
mail settings
Submitter Durham Goode
Date Jan. 19, 2016, 11:33 p.m.
Message ID <4d4d9599055b4a502244.1453246404@dev8486.prn1.facebook.com>
Download mbox | patch
Permalink /patch/12839/
State Accepted
Headers show

Comments

Durham Goode - Jan. 19, 2016, 11:33 p.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1453246223 28800
#      Tue Jan 19 15:30:23 2016 -0800
# Node ID 4d4d9599055b4a502244774004dc8e025b9f0664
# Parent  29749ba62f3da37dba7329062c7f9a82a09dde6d
test: update with new graft output

Graft now has a --continue it seems. We need to update our test output.
Pierre-Yves David - Jan. 20, 2016, 12:35 a.m.
On 01/19/2016 03:33 PM, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode <durham@fb.com>
> # Date 1453246223 28800
> #      Tue Jan 19 15:30:23 2016 -0800
> # Node ID 4d4d9599055b4a502244774004dc8e025b9f0664
> # Parent  29749ba62f3da37dba7329062c7f9a82a09dde6d
> test: update with new graft output
>
> Graft now has a --continue it seems. We need to update our test output.
>
> diff --git a/tests/test-evolve.t b/tests/test-evolve.t
> --- a/tests/test-evolve.t
> +++ b/tests/test-evolve.t
> @@ -601,6 +601,7 @@ Test graft --continue
>     $ echo 3 > 1
>     $ hg resolve -m 1
>     (no more unresolved files)
> +  continue: hg graft --continue
>     $ hg graft --continue -O
>     grafting 7:a5bfd90a2f29 "conflict" (tip)
>     $ glog --hidden

I've taken the change to this file only (legit graft)


> diff --git a/tests/test-stabilize-conflict.t b/tests/test-stabilize-conflict.t
> --- a/tests/test-stabilize-conflict.t
> +++ b/tests/test-stabilize-conflict.t
> @@ -165,6 +165,7 @@ proper behavior with conflict using inte
>     $ safesed 's/dix/ten/' babar
>     $ hg resolve --all -m
>     (no more unresolved files)
> +  continue: hg graft --continue
>     $ hg evolve --continue
>     grafting 5:71c18f70c34f "babar count up to fifteen"
>     $ hg resolve -l
> diff --git a/tests/test-stabilize-result.t b/tests/test-stabilize-result.t
> --- a/tests/test-stabilize-result.t
> +++ b/tests/test-stabilize-result.t
> @@ -102,6 +102,7 @@ Test evolve with conflict
>     [255]
>     $ hg resolve -m a
>     (no more unresolved files)
> +  continue: hg graft --continue
>     $ hg evolve --continue
>     grafting 5:3655f0f50885 "newer a"

In these two case, we are in an evolve, not actually in a graft. We 
should not accept this new output (and finish the "evolve should have 
its own state series" instead)

Cheers,

Patch

diff --git a/tests/test-evolve.t b/tests/test-evolve.t
--- a/tests/test-evolve.t
+++ b/tests/test-evolve.t
@@ -601,6 +601,7 @@  Test graft --continue
   $ echo 3 > 1
   $ hg resolve -m 1
   (no more unresolved files)
+  continue: hg graft --continue
   $ hg graft --continue -O
   grafting 7:a5bfd90a2f29 "conflict" (tip)
   $ glog --hidden
diff --git a/tests/test-stabilize-conflict.t b/tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t
+++ b/tests/test-stabilize-conflict.t
@@ -165,6 +165,7 @@  proper behavior with conflict using inte
   $ safesed 's/dix/ten/' babar
   $ hg resolve --all -m
   (no more unresolved files)
+  continue: hg graft --continue
   $ hg evolve --continue
   grafting 5:71c18f70c34f "babar count up to fifteen"
   $ hg resolve -l
diff --git a/tests/test-stabilize-result.t b/tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t
+++ b/tests/test-stabilize-result.t
@@ -102,6 +102,7 @@  Test evolve with conflict
   [255]
   $ hg resolve -m a
   (no more unresolved files)
+  continue: hg graft --continue
   $ hg evolve --continue
   grafting 5:3655f0f50885 "newer a"