Patchwork [Bug,4988] New: test-subrepo-missing.t failure on Windows

login
register
mail settings
Submitter mercurial-bugs@selenic.com
Date Dec. 6, 2015, 2:59 a.m.
Message ID <bug-4988-285@https.bz.mercurial-scm.org/>
Download mbox | patch
Permalink /patch/11848/
State Not Applicable
Headers show

Comments

mercurial-bugs@selenic.com - Dec. 6, 2015, 2:59 a.m.
https://bz.mercurial-scm.org/show_bug.cgi?id=4988

            Bug ID: 4988
           Summary: test-subrepo-missing.t failure on Windows
           Product: Mercurial
           Version: default branch
          Hardware: PC
                OS: Windows
            Status: UNCONFIRMED
          Severity: bug
          Priority: normal
         Component: Mercurial
          Assignee: bugzilla@selenic.com
          Reporter: matt_harbison@yahoo.com
                CC: mercurial-devel@selenic.com

The test started failing at:

changeset:   29562:25e4b2f000c5
user:        Siddharth Agarwal <sid0@fb.com>
date:        Wed Nov 25 14:25:33 2015 -0800
summary:     merge: move almost all change/delete conflicts to resolve phase
(BC) (API)



Yuya has an idea to fix it that seems to work:

https://selenic.com/pipermail/mercurial-devel/2015-December/076458.html

Patch

--- c:/Users/Matt/Projects/hg/tests/test-subrepo-missing.t
+++ c:/Users/Matt/Projects/hg/tests/test-subrepo-missing.t.err
@@ -64,8 +64,12 @@ 
   $ hg up 0
   remote changed .hgsubstate which local deleted
   use (c)hanged version or leave (d)eleted? c
+   subrepository subrepo diverged (local revision: , remote revision:
07f494440405)
+  (M)erge, keep (l)ocal or keep (r)emote? m
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg st
+  M .hgsubstate
   $ ls subrepo
   a