Mercurial > hg-stable
comparison tests/test-largefiles.t @ 18300:745bc16ccef2
largefiles: fix update from a merge with removed files
A situation with this case could happen after interrupting an update. Update
would fail with:
abort: No such file or directory: $TESTTMP/f/.hglf/sub2/large6
Update from a merge without using clean is not possible anyway, so this patch
takes a step in the right direction so it gets as far as reporting the right
error.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 11 Jan 2013 16:30:29 +0100 |
parents | a7a88a458a4c |
children | ed23d6100dd3 |
comparison
equal
deleted
inserted
replaced
18299:a7a88a458a4c | 18300:745bc16ccef2 |
---|---|
1218 getting changed largefiles | 1218 getting changed largefiles |
1219 1 largefiles updated, 0 removed | 1219 1 largefiles updated, 0 removed |
1220 $ hg status | 1220 $ hg status |
1221 M large | 1221 M large |
1222 | 1222 |
1223 - make sure update of merge with removed largefiles fails as expected | |
1224 $ hg rm sub2/large6 | |
1225 $ hg up -r. | |
1226 abort: outstanding uncommitted merges | |
1227 [255] | |
1228 | |
1223 - revert should be able to revert files introduced in a pending merge | 1229 - revert should be able to revert files introduced in a pending merge |
1224 $ hg revert --all -r . | 1230 $ hg revert --all -r . |
1225 removing .hglf/large | 1231 removing .hglf/large |
1232 undeleting .hglf/sub2/large6 | |
1226 | 1233 |
1227 Test that a normal file and a largefile with the same name and path cannot | 1234 Test that a normal file and a largefile with the same name and path cannot |
1228 coexist. | 1235 coexist. |
1229 | 1236 |
1230 $ rm sub2/large7 | 1237 $ rm sub2/large7 |