71 $ cat .hglf/large .hglf/anotherlarge |
72 $ cat .hglf/large .hglf/anotherlarge |
72 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 |
73 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 |
73 3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 |
74 3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 |
74 $ cd .. |
75 $ cd .. |
75 |
76 |
|
77 add some changesets to rename/remove/merge |
|
78 $ cd bigfile-repo |
|
79 $ hg mv -q sub stuff |
|
80 $ hg commit -m"rename sub/ to stuff/" |
|
81 $ hg update -q 1 |
|
82 $ echo blah >> normal3 |
|
83 $ echo blah >> sub/normal2 |
|
84 $ echo blah >> sub/maybelarge.dat |
|
85 $ sha1sum sub/maybelarge.dat |
|
86 76236b6a2c6102826c61af4297dd738fb3b1de38 sub/maybelarge.dat |
|
87 $ hg commit -A -m"add normal3, modify sub/*" |
|
88 adding normal3 |
|
89 created new head |
|
90 $ hg rm large normal3 |
|
91 $ hg commit -q -m"remove large, normal3" |
|
92 $ hg merge |
|
93 merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat |
|
94 warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. |
|
95 merging stuff/maybelarge.dat failed! |
|
96 merging sub/normal2 and stuff/normal2 to stuff/normal2 |
|
97 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
|
98 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
99 [1] |
|
100 $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat |
|
101 $ hg resolve -m stuff/maybelarge.dat |
|
102 $ hg commit -m"merge" |
|
103 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n" |
|
104 @ 5:4884f215abda merge |
|
105 |\ |
|
106 | o 4:7285f817b77e remove large, normal3 |
|
107 | | |
|
108 | o 3:67e3892e3534 add normal3, modify sub/* |
|
109 | | |
|
110 o | 2:c96c8beb5d56 rename sub/ to stuff/ |
|
111 |/ |
|
112 o 1:020c65d24e11 add sub/* |
|
113 | |
|
114 o 0:117b8328f97a add large, normal1 |
|
115 |
|
116 $ cd .. |
|
117 |
|
118 lfconvert with rename, merge, and remove |
|
119 $ hg lfconvert --size 0.2 bigfile-repo largefiles2-repo |
|
120 initializing destination largefiles2-repo |
|
121 $ cd largefiles2-repo |
|
122 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n" |
|
123 o 5:8e05f5f2b77e merge |
|
124 |\ |
|
125 | o 4:a5a02de7a8e4 remove large, normal3 |
|
126 | | |
|
127 | o 3:55759520c76f add normal3, modify sub/* |
|
128 | | |
|
129 o | 2:261ad3f3f037 rename sub/ to stuff/ |
|
130 |/ |
|
131 o 1:334e5237836d add sub/* |
|
132 | |
|
133 o 0:d4892ec57ce2 add large, normal1 |
|
134 |
|
135 $ hg locate -r 2 |
|
136 .hglf/large |
|
137 .hglf/stuff/maybelarge.dat |
|
138 normal1 |
|
139 stuff/normal2 |
|
140 $ hg locate -r 3 |
|
141 .hglf/large |
|
142 .hglf/sub/maybelarge.dat |
|
143 normal1 |
|
144 normal3 |
|
145 sub/normal2 |
|
146 $ hg locate -r 4 |
|
147 .hglf/sub/maybelarge.dat |
|
148 normal1 |
|
149 sub/normal2 |
|
150 $ hg locate -r 5 |
|
151 .hglf/stuff/maybelarge.dat |
|
152 normal1 |
|
153 stuff/normal2 |
|
154 $ hg update |
|
155 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
156 getting changed largefiles |
|
157 1 largefiles updated, 0 removed |
|
158 $ cat stuff/normal2 |
|
159 alsonormal |
|
160 blah |
|
161 $ sha1sum stuff/maybelarge.dat |
|
162 76236b6a2c6102826c61af4297dd738fb3b1de38 stuff/maybelarge.dat |
|
163 $ cat .hglf/stuff/maybelarge.dat |
|
164 76236b6a2c6102826c61af4297dd738fb3b1de38 |
|
165 $ cd .. |
|
166 |
76 "lfconvert" error cases |
167 "lfconvert" error cases |
77 $ hg lfconvert http://localhost/foo foo |
168 $ hg lfconvert http://localhost/foo foo |
78 abort: http://localhost/foo is not a local Mercurial repo |
169 abort: http://localhost/foo is not a local Mercurial repo |
79 [255] |
170 [255] |
80 $ hg lfconvert foo ssh://localhost/foo |
171 $ hg lfconvert foo ssh://localhost/foo |