Patchwork [7,of,7,mergedriver] test-resolve.t: switch to mergestate.read()

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 18, 2015, 5:48 a.m.
Message ID <9cb18faf8158bdd03e0d.1447825716@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11464/
State Accepted
Headers show

Comments

Siddharth Agarwal - Nov. 18, 2015, 5:48 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447803801 28800
#      Tue Nov 17 15:43:21 2015 -0800
# Node ID 9cb18faf8158bdd03e0d29e85f363f7d4e429ed8
# Parent  b117fd7573f85100dc93355a1cf0c0609d525aee
test-resolve.t: switch to mergestate.read()

See previous patches for why we're doing this.
Martin von Zweigbergk - Nov. 18, 2015, 6:26 a.m.
Pushed to the clowncopter, thanks!

On Tue, Nov 17, 2015 at 9:52 PM Siddharth Agarwal <sid0@fb.com> wrote:

> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1447803801 28800
> #      Tue Nov 17 15:43:21 2015 -0800
> # Node ID 9cb18faf8158bdd03e0d29e85f363f7d4e429ed8
> # Parent  b117fd7573f85100dc93355a1cf0c0609d525aee
> test-resolve.t: switch to mergestate.read()
>
> See previous patches for why we're doing this.
>
> diff --git a/tests/test-resolve.t b/tests/test-resolve.t
> --- a/tests/test-resolve.t
> +++ b/tests/test-resolve.t
> @@ -66,7 +66,7 @@ don't allow marking or unmarking driver-
>    > def markdriver(ui, repo, *pats, **opts):
>    >     wlock = repo.wlock()
>    >     try:
> -  >         ms = merge.mergestate(repo)
> +  >         ms = merge.mergestate.read(repo)
>    >         m = scmutil.match(repo[None], pats, opts)
>    >         for f in ms:
>    >             if not m(f):
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -66,7 +66,7 @@  don't allow marking or unmarking driver-
   > def markdriver(ui, repo, *pats, **opts):
   >     wlock = repo.wlock()
   >     try:
-  >         ms = merge.mergestate(repo)
+  >         ms = merge.mergestate.read(repo)
   >         m = scmutil.match(repo[None], pats, opts)
   >         for f in ms:
   >             if not m(f):