Mercurial > hg-stable
comparison tests/test-fix.t @ 47767:66ad7e32011f stable
fix: use scmutil.movedirstate() instead of reimplementing
I wrote this patch 2 years ago as a little cleanup. I wanted to
generally used `scmutil.movedirstate()` instead of manually updating
the dirstate because that is easy to get wrong. I didn't know until
today that the current code had a bug. So I added the test case two
patches before this one and dusted off this one patch. This is a
little slower than the previous code, as it diffs two
manifests. However, it fixes the bug and I don't think it's going to
be noticeably slower anyway.
Differential Revision: https://phab.mercurial-scm.org/D11210
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 11 Mar 2019 10:59:35 -0700 |
| parents | 184d83ef2e59 |
| children | 86a60679cf61 |
comparison
equal
deleted
inserted
replaced
| 47766:3feda1e779d4 | 47767:66ad7e32011f |
|---|---|
| 368 $ hg fix -w * | 368 $ hg fix -w * |
| 369 $ hg st | 369 $ hg st |
| 370 M hello.whole | 370 M hello.whole |
| 371 $ hg fix -s . * | 371 $ hg fix -s . * |
| 372 $ hg st | 372 $ hg st |
| 373 M hello.whole (known-bad-output !) | |
| 374 $ hg diff | 373 $ hg diff |
| 375 | 374 |
| 376 $ cd .. | 375 $ cd .. |
| 377 | 376 |
| 378 Test the effect of fixing the working directory for each possible status, with | 377 Test the effect of fixing the working directory for each possible status, with |