# HG changeset patch # User Matt Mackall # Date 1310603276 18000 # Node ID 3e9a5c3e24d8323e6e9dd6dd5447eedfea4a0b98 # Parent d7b424a0362720eef8d01b21447cd77fb402582a# Parent f73c7b70df685293fa094b707ed7c98ba3d08663 merge with stable diff -r d7b424a03627 -r 3e9a5c3e24d8 mercurial/localrepo.py --- a/mercurial/localrepo.py Wed Jul 13 16:43:18 2011 -0500 +++ b/mercurial/localrepo.py Wed Jul 13 19:27:56 2011 -0500 @@ -1195,7 +1195,7 @@ if working: # we need to scan the working dir subrepos = [] if '.hgsub' in self.dirstate: - subrepos = ctx1.substate.keys() + subrepos = ctx2.substate.keys() s = self.dirstate.status(match, subrepos, listignored, listclean, listunknown) cmp, modified, added, removed, deleted, unknown, ignored, clean = s diff -r d7b424a03627 -r 3e9a5c3e24d8 tests/test-mq-subrepo-svn.t --- a/tests/test-mq-subrepo-svn.t Wed Jul 13 16:43:18 2011 -0500 +++ b/tests/test-mq-subrepo-svn.t Wed Jul 13 19:27:56 2011 -0500 @@ -36,7 +36,6 @@ $ hg add .hgsub $ hg status -S -X '**/format' A .hgsub - ? sub/.svn/entries $ hg qnew -m0 0.diff committing subrepository sub $ cd sub diff -r d7b424a03627 -r 3e9a5c3e24d8 tests/test-subrepo-missing.t --- a/tests/test-subrepo-missing.t Wed Jul 13 16:43:18 2011 -0500 +++ b/tests/test-subrepo-missing.t Wed Jul 13 19:27:56 2011 -0500 @@ -19,6 +19,7 @@ $ rm .hgsub $ hg revert .hgsub warning: subrepo spec file .hgsub not found + warning: subrepo spec file .hgsub not found delete .hgsubstate and revert it @@ -30,8 +31,10 @@ $ rm .hgsub $ hg up 0 warning: subrepo spec file .hgsub not found + warning: subrepo spec file .hgsub not found 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg st + warning: subrepo spec file .hgsub not found ! .hgsub $ ls subrepo a @@ -40,6 +43,7 @@ $ hg up -C warning: subrepo spec file .hgsub not found + warning: subrepo spec file .hgsub not found 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ rm .hgsubstate $ hg up 0