equal
deleted
inserted
replaced
2 $ mkdir "${USERCACHE}" |
2 $ mkdir "${USERCACHE}" |
3 $ cat >> $HGRCPATH <<EOF |
3 $ cat >> $HGRCPATH <<EOF |
4 > [extensions] |
4 > [extensions] |
5 > largefiles = |
5 > largefiles = |
6 > share = |
6 > share = |
7 > graphlog = |
|
8 > strip = |
7 > strip = |
9 > convert = |
8 > convert = |
10 > [largefiles] |
9 > [largefiles] |
11 > minsize = 0.5 |
10 > minsize = 0.5 |
12 > patterns = **.other |
11 > patterns = **.other |
132 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
131 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
133 [1] |
132 [1] |
134 $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat |
133 $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat |
135 $ hg resolve -m stuff/maybelarge.dat |
134 $ hg resolve -m stuff/maybelarge.dat |
136 $ hg commit -m"merge" |
135 $ hg commit -m"merge" |
137 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n" |
136 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" |
138 @ 5:4884f215abda merge |
137 @ 5:4884f215abda merge |
139 |\ |
138 |\ |
140 | o 4:7285f817b77e remove large, normal3 |
139 | o 4:7285f817b77e remove large, normal3 |
141 | | |
140 | | |
142 | o 3:67e3892e3534 add normal3, modify sub/* |
141 | o 3:67e3892e3534 add normal3, modify sub/* |
152 lfconvert with rename, merge, and remove |
151 lfconvert with rename, merge, and remove |
153 $ rm -rf largefiles-repo |
152 $ rm -rf largefiles-repo |
154 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo |
153 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo |
155 initializing destination largefiles-repo |
154 initializing destination largefiles-repo |
156 $ cd largefiles-repo |
155 $ cd largefiles-repo |
157 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n" |
156 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" |
158 o 5:8e05f5f2b77e merge |
157 o 5:8e05f5f2b77e merge |
159 |\ |
158 |\ |
160 | o 4:a5a02de7a8e4 remove large, normal3 |
159 | o 4:a5a02de7a8e4 remove large, normal3 |
161 | | |
160 | | |
162 | o 3:55759520c76f add normal3, modify sub/* |
161 | o 3:55759520c76f add normal3, modify sub/* |
246 # removes 'large' relative to the first parent in both repos, it seems |
245 # removes 'large' relative to the first parent in both repos, it seems |
247 # to me that lfconvert is doing a *better* job than |
246 # to me that lfconvert is doing a *better* job than |
248 # "hg remove" + "hg merge" + "hg commit". |
247 # "hg remove" + "hg merge" + "hg commit". |
249 # $ hg -R ../bigfile-repo debugdata -c 5 |
248 # $ hg -R ../bigfile-repo debugdata -c 5 |
250 # $ hg debugdata -c 5 |
249 # $ hg debugdata -c 5 |
251 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n" |
250 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" |
252 o 6:1635824e6f59 add anotherlarge (should be a largefile) |
251 o 6:1635824e6f59 add anotherlarge (should be a largefile) |
253 | |
252 | |
254 o 5:7215f8deeaaf merge |
253 o 5:7215f8deeaaf merge |
255 |\ |
254 |\ |
256 | o 4:7285f817b77e remove large, normal3 |
255 | o 4:7285f817b77e remove large, normal3 |
290 3 add normal3, modify sub/* |
289 3 add normal3, modify sub/* |
291 2 remove large, normal3 |
290 2 remove large, normal3 |
292 1 merge |
291 1 merge |
293 0 add anotherlarge (should be a largefile) |
292 0 add anotherlarge (should be a largefile) |
294 |
293 |
295 $ hg -R largefiles-repo-hg glog --template "{rev}:{node|short} {desc|firstline}\n" |
294 $ hg -R largefiles-repo-hg log -G --template "{rev}:{node|short} {desc|firstline}\n" |
296 o 6:17126745edfd add anotherlarge (should be a largefile) |
295 o 6:17126745edfd add anotherlarge (should be a largefile) |
297 | |
296 | |
298 o 5:9cc5aa7204f0 merge |
297 o 5:9cc5aa7204f0 merge |
299 |\ |
298 |\ |
300 | o 4:a5a02de7a8e4 remove large, normal3 |
299 | o 4:a5a02de7a8e4 remove large, normal3 |