Mercurial > public > mercurial-scm > hg-stable
diff tests/test-mq-subrepo.t @ 30200:a2804ddcf9ae
update: enable copy tracing for backwards and non-linear updates
As a followup to the issue4028 series, this fixes a variant of the issue
that can occur when updating with uncommited local changes.
The duplicated .hgsub warning is coming from wc.dirty(). We would previously
skip this call because it's only relevant when we're going to perform copy
tracing, which we didn't do before.
The change to the update summary line is because we now treat the rename as a
proper rename (which counts as a change), rather than an add+delete pair
(which counts as a change and a delete).
| author | G?bor Stefanik <gabor.stefanik@nng.com> |
|---|---|
| date | Thu, 25 Aug 2016 22:02:26 +0200 |
| parents | bbf544b5f2e9 |
| children | 6d88468d435b |
line wrap: on
line diff
--- a/tests/test-mq-subrepo.t Mon Sep 26 10:47:37 2016 +0200 +++ b/tests/test-mq-subrepo.t Thu Aug 25 22:02:26 2016 +0200 @@ -304,6 +304,7 @@ record this change to '.hgsub'? [Ynesfdaq?] y warning: subrepo spec file '.hgsub' not found + warning: subrepo spec file '.hgsub' not found abort: uncommitted changes in subrepository 'sub' [255] % update substate when adding .hgsub w/clean updated subrepo @@ -319,6 +320,7 @@ record this change to '.hgsub'? [Ynesfdaq?] y warning: subrepo spec file '.hgsub' not found + warning: subrepo spec file '.hgsub' not found path sub source sub revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31