Patchwork [1,of,2,V3,mergedriver] mergestate: move binary format documentation into _readrecordsv2

login
register
mail settings
Submitter Pierre-Yves David
Date Nov. 19, 2015, 6:39 a.m.
Message ID <564D6EB3.8070308@ens-lyon.org>
Download mbox | patch
Permalink /patch/11502/
State Accepted
Commit 35102876d648a79a93e5da49891154203f9af956
Headers show

Comments

Pierre-Yves David - Nov. 19, 2015, 6:39 a.m.
On 11/18/2015 04:45 PM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1447893570 28800
> #      Wed Nov 18 16:39:30 2015 -0800
> # Node ID e430868bb6e624d96c6f25bb30e48263fcdd4130
> # Parent  3b312562d19f8d6695f1f8c162088dab8c7fda1d
> # Available At http://42.netv6.net/sid0-wip/hg/
> #              hg pull http://42.netv6.net/sid0-wip/hg/ -r e430868bb6e6
> mergestate: move binary format documentation into _readrecordsv2\

I've pushed that one. Second one make test-resolve.t fails. Some poking 
around seems like the expected output is wrong. I'll let sid0 figure 
that out.

Patch

--- /home/pyd/src/mercurial-dev/tests/test-resolve.t
+++ /home/pyd/src/mercurial-dev/tests/test-resolve.t.err
@@ -301,7 +301,7 @@ 
     append bar to files
    branch: default
    warning: merge state has unsupported record types: X
-  commit: 2 modified, 2 unknown (merge)
+  commit: 2 modified, 3 unknown (merge)
    update: 2 new changesets (update)
    phases: 5 draft