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