Mercurial > hg
comparison tests/test-commit-amend.t @ 23139:e53f6b72a0e4
spelling: fixes from proofreading of spell checker issues
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 17 Apr 2014 22:47:38 +0200 |
| parents | 652ab726ba93 |
| children | bd5dbb8a05c8 |
comparison
equal
deleted
inserted
replaced
| 23136:6eab50a34fed | 23139:e53f6b72a0e4 |
|---|---|
| 887 o 0 a0 | 887 o 0 a0 |
| 888 | 888 |
| 889 | 889 |
| 890 The way mercurial does amends is to create a temporary commit (rev 3) and then | 890 The way mercurial does amends is to create a temporary commit (rev 3) and then |
| 891 fold the new and old commits together into another commit (rev 4). During this | 891 fold the new and old commits together into another commit (rev 4). During this |
| 892 process, findlimit is called to check how far back to look for the transitive | 892 process, _findlimit is called to check how far back to look for the transitive |
| 893 closure of file copy information, but due to the divergence of the filelog | 893 closure of file copy information, but due to the divergence of the filelog |
| 894 and changelog graph topologies, before findlimit was fixed, it returned a rev | 894 and changelog graph topologies, before _findlimit was fixed, it returned a rev |
| 895 which was not far enough back in this case. | 895 which was not far enough back in this case. |
| 896 $ hg mv a1 a2 | 896 $ hg mv a1 a2 |
| 897 $ hg status --copies --rev 0 | 897 $ hg status --copies --rev 0 |
| 898 A a2 | 898 A a2 |
| 899 a0 | 899 a0 |