1003 "update --check" refuses to update with uncommitted changes. |
1003 "update --check" refuses to update with uncommitted changes. |
1004 $ hg update --check 8 |
1004 $ hg update --check 8 |
1005 abort: uncommitted local changes |
1005 abort: uncommitted local changes |
1006 [255] |
1006 [255] |
1007 |
1007 |
1008 "update --clean" leaves correct largefiles in working copy. |
1008 "update --clean" leaves correct largefiles in working copy, even when there is |
1009 |
1009 .orig files from revert in .hglf. |
|
1010 |
|
1011 $ echo mistake > sub2/large7 |
|
1012 $ hg revert sub2/large7 |
|
1013 $ hg -q update --clean -r null |
1010 $ hg update --clean |
1014 $ hg update --clean |
1011 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1015 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1012 getting changed largefiles |
1016 getting changed largefiles |
1013 1 largefiles updated, 0 removed |
1017 3 largefiles updated, 0 removed |
1014 $ cat normal3 |
1018 $ cat normal3 |
1015 normal3-modified |
1019 normal3-modified |
1016 $ cat sub/normal4 |
1020 $ cat sub/normal4 |
1017 normal4-modified |
1021 normal4-modified |
1018 $ cat sub/large4 |
1022 $ cat sub/large4 |
1019 large4-modified |
1023 large4-modified |
1020 $ cat sub2/large6 |
1024 $ cat sub2/large6 |
1021 large6-modified |
1025 large6-modified |
1022 $ cat sub2/large7 |
1026 $ cat sub2/large7 |
1023 large7 |
1027 large7 |
|
1028 $ cat sub2/large7.orig |
|
1029 mistake |
|
1030 $ cat .hglf/sub2/large7.orig |
|
1031 9dbfb2c79b1c40981b258c3efa1b10b03f18ad31 |
|
1032 |
|
1033 demonstrate misfeature: .orig file is overwritten on every update -C, |
|
1034 also when clean: |
|
1035 $ hg update --clean |
|
1036 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1037 getting changed largefiles |
|
1038 0 largefiles updated, 0 removed |
|
1039 $ cat sub2/large7.orig |
|
1040 large7 |
|
1041 $ rm sub2/large7.orig .hglf/sub2/large7.orig |
1024 |
1042 |
1025 Now "update check" is happy. |
1043 Now "update check" is happy. |
1026 $ hg update --check 8 |
1044 $ hg update --check 8 |
1027 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1045 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1028 getting changed largefiles |
1046 getting changed largefiles |