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

[mercurial-bugs at selenic.com]

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 at selenic.com
          Reporter: matt_harbison at yahoo.com
                CC: mercurial-devel at selenic.com

The test started failing at:

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


--- 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

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

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

-- 
You are receiving this mail because:
You are on the CC list for the bug.