Mercurial > hg
annotate tests/test-lfconvert.t @ 17777:af7c6bc48d8d
run-tests: alternative way of handling \r on Windows
After f71d60da58fb all \r was stripped from output on Windows, and the places
where a \r explicitly was expected it was accepted that it was missing. Ugly
hack.
Instead we now accept that an extra \r might appear at the end of lines on
Windows. That is more to the point and less ugly.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Mon, 15 Oct 2012 02:33:12 +0200 |
parents | f2719b387380 |
children | 0fc1ce271ee6 |
rev | line source |
---|---|
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
2 > [extensions] |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
3 > largefiles = |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
4 > share = |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
5 > graphlog = |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
6 > mq = |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
7 > [largefiles] |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
8 > minsize = 0.5 |
15579
6c5e6ebe0812
largefiles: use "ui.configlist()" to get largefiles.patterns configuration
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15389
diff
changeset
|
9 > patterns = **.other |
6c5e6ebe0812
largefiles: use "ui.configlist()" to get largefiles.patterns configuration
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15389
diff
changeset
|
10 > **.dat |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
11 > EOF |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
12 |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
13 "lfconvert" works |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
14 $ hg init bigfile-repo |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
15 $ cd bigfile-repo |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
16 $ cat >> .hg/hgrc <<EOF |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
17 > [extensions] |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
18 > largefiles = ! |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
19 > EOF |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
20 $ mkdir sub |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
21 $ dd if=/dev/zero bs=1k count=256 > large 2> /dev/null |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
22 $ dd if=/dev/zero bs=1k count=256 > large2 2> /dev/null |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
23 $ echo normal > normal1 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
24 $ echo alsonormal > sub/normal2 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
25 $ dd if=/dev/zero bs=1k count=10 > sub/maybelarge.dat 2> /dev/null |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
26 $ hg addremove |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
27 adding large |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
28 adding large2 |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
29 adding normal1 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
30 adding sub/maybelarge.dat |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
31 adding sub/normal2 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
32 $ hg commit -m"add large, normal1" large normal1 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
33 $ hg commit -m"add sub/*" sub |
16908
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
34 |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
35 Test tag parsing |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
36 $ cat >> .hgtags <<EOF |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
37 > IncorrectlyFormattedTag! |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
38 > invalidhash sometag |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
39 > 0123456789abcdef anothertag |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
40 > EOF |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
41 $ hg add .hgtags |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
42 $ hg commit -m"add large2" large2 .hgtags |
16908
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
43 |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
44 Test link+rename largefile codepath |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
45 $ [ -d .hg/largefiles ] && echo fail || echo pass |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
46 pass |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
47 $ cd .. |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
48 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
49 initializing destination largefiles-repo |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
50 skipping incorrectly formatted tag IncorrectlyFormattedTag! |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
51 skipping incorrectly formatted id invalidhash |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
52 no mapping for id 0123456789abcdef |
16908
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
53 #if symlink |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
54 $ hg --cwd bigfile-repo rename large2 large3 |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
55 $ ln -sf large bigfile-repo/large3 |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
56 $ hg --cwd bigfile-repo commit -m"make large2 a symlink" large2 large3 |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
57 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo-symlink |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
58 initializing destination largefiles-repo-symlink |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
59 skipping incorrectly formatted tag IncorrectlyFormattedTag! |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
60 skipping incorrectly formatted id invalidhash |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
61 no mapping for id 0123456789abcdef |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
62 abort: renamed/copied largefile large3 becomes symlink |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
63 [255] |
16908
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
64 #endif |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
65 $ cd bigfile-repo |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
66 $ hg strip --no-backup 2 |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
67 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
68 $ cd .. |
16908
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
69 $ rm -rf largefiles-repo largefiles-repo-symlink |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
70 |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
71 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
72 initializing destination largefiles-repo |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
73 |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
74 "lfconvert" converts content correctly |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
75 $ cd largefiles-repo |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
76 $ hg up |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
77 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
78 getting changed largefiles |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
79 2 largefiles updated, 0 removed |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
80 $ hg locate |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
81 .hglf/large |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
82 .hglf/sub/maybelarge.dat |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
83 normal1 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
84 sub/normal2 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
85 $ cat normal1 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
86 normal |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
87 $ cat sub/normal2 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
88 alsonormal |
15389
3bece03bf3c6
tests: use md5sum.py instead of sha1sum, add check
Matt Mackall <mpm@selenic.com>
parents:
15364
diff
changeset
|
89 $ "$TESTDIR/md5sum.py" large sub/maybelarge.dat |
3bece03bf3c6
tests: use md5sum.py instead of sha1sum, add check
Matt Mackall <mpm@selenic.com>
parents:
15364
diff
changeset
|
90 ec87a838931d4d5d2e94a04644788a55 large |
3bece03bf3c6
tests: use md5sum.py instead of sha1sum, add check
Matt Mackall <mpm@selenic.com>
parents:
15364
diff
changeset
|
91 1276481102f218c981e0324180bafd9f sub/maybelarge.dat |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
92 |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
93 "lfconvert" adds 'largefiles' to .hg/requires. |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
94 $ cat .hg/requires |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
95 largefiles |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
96 revlogv1 |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
97 fncache |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
98 store |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
99 dotencode |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
100 |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
101 "lfconvert" includes a newline at the end of the standin files. |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
102 $ cat .hglf/large .hglf/sub/maybelarge.dat |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
103 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
104 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
105 $ cd .. |
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
106 |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
107 add some changesets to rename/remove/merge |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
108 $ cd bigfile-repo |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
109 $ hg mv -q sub stuff |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
110 $ hg commit -m"rename sub/ to stuff/" |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
111 $ hg update -q 1 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
112 $ echo blah >> normal3 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
113 $ echo blah >> sub/normal2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
114 $ echo blah >> sub/maybelarge.dat |
15389
3bece03bf3c6
tests: use md5sum.py instead of sha1sum, add check
Matt Mackall <mpm@selenic.com>
parents:
15364
diff
changeset
|
115 $ "$TESTDIR/md5sum.py" sub/maybelarge.dat |
3bece03bf3c6
tests: use md5sum.py instead of sha1sum, add check
Matt Mackall <mpm@selenic.com>
parents:
15364
diff
changeset
|
116 1dd0b99ff80e19cff409702a1d3f5e15 sub/maybelarge.dat |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
117 $ hg commit -A -m"add normal3, modify sub/*" |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
118 adding normal3 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
119 created new head |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
120 $ hg rm large normal3 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
121 $ hg commit -q -m"remove large, normal3" |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
122 $ hg merge |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
123 merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15389
diff
changeset
|
124 warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob) |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
15447
diff
changeset
|
125 merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark') |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
126 merging sub/normal2 and stuff/normal2 to stuff/normal2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
127 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
128 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
129 [1] |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
130 $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
131 $ hg resolve -m stuff/maybelarge.dat |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
132 $ hg commit -m"merge" |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
133 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n" |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
134 @ 5:4884f215abda merge |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
135 |\ |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
136 | o 4:7285f817b77e remove large, normal3 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
137 | | |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
138 | o 3:67e3892e3534 add normal3, modify sub/* |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
139 | | |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
140 o | 2:c96c8beb5d56 rename sub/ to stuff/ |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
141 |/ |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
142 o 1:020c65d24e11 add sub/* |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
143 | |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
144 o 0:117b8328f97a add large, normal1 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
145 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
146 $ cd .. |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
147 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
148 lfconvert with rename, merge, and remove |
15343
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
149 $ rm -rf largefiles-repo |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
150 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
151 initializing destination largefiles-repo |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
152 $ cd largefiles-repo |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
153 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n" |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
154 o 5:8e05f5f2b77e merge |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
155 |\ |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
156 | o 4:a5a02de7a8e4 remove large, normal3 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
157 | | |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
158 | o 3:55759520c76f add normal3, modify sub/* |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
159 | | |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
160 o | 2:261ad3f3f037 rename sub/ to stuff/ |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
161 |/ |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
162 o 1:334e5237836d add sub/* |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
163 | |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
164 o 0:d4892ec57ce2 add large, normal1 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
165 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
166 $ hg locate -r 2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
167 .hglf/large |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
168 .hglf/stuff/maybelarge.dat |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
169 normal1 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
170 stuff/normal2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
171 $ hg locate -r 3 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
172 .hglf/large |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
173 .hglf/sub/maybelarge.dat |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
174 normal1 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
175 normal3 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
176 sub/normal2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
177 $ hg locate -r 4 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
178 .hglf/sub/maybelarge.dat |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
179 normal1 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
180 sub/normal2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
181 $ hg locate -r 5 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
182 .hglf/stuff/maybelarge.dat |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
183 normal1 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
184 stuff/normal2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
185 $ hg update |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
186 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
187 getting changed largefiles |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
188 1 largefiles updated, 0 removed |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
189 $ cat stuff/normal2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
190 alsonormal |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
191 blah |
15389
3bece03bf3c6
tests: use md5sum.py instead of sha1sum, add check
Matt Mackall <mpm@selenic.com>
parents:
15364
diff
changeset
|
192 $ "$TESTDIR/md5sum.py" stuff/maybelarge.dat |
3bece03bf3c6
tests: use md5sum.py instead of sha1sum, add check
Matt Mackall <mpm@selenic.com>
parents:
15364
diff
changeset
|
193 1dd0b99ff80e19cff409702a1d3f5e15 stuff/maybelarge.dat |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
194 $ cat .hglf/stuff/maybelarge.dat |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
195 76236b6a2c6102826c61af4297dd738fb3b1de38 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
196 $ cd .. |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
197 |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
198 "lfconvert" error cases |
15340
0e58513cc59a
largefiles: rearrange how lfconvert detects non-local repos
Greg Ward <greg@gerg.ca>
parents:
15339
diff
changeset
|
199 $ hg lfconvert http://localhost/foo foo |
0e58513cc59a
largefiles: rearrange how lfconvert detects non-local repos
Greg Ward <greg@gerg.ca>
parents:
15339
diff
changeset
|
200 abort: http://localhost/foo is not a local Mercurial repo |
0e58513cc59a
largefiles: rearrange how lfconvert detects non-local repos
Greg Ward <greg@gerg.ca>
parents:
15339
diff
changeset
|
201 [255] |
0e58513cc59a
largefiles: rearrange how lfconvert detects non-local repos
Greg Ward <greg@gerg.ca>
parents:
15339
diff
changeset
|
202 $ hg lfconvert foo ssh://localhost/foo |
0e58513cc59a
largefiles: rearrange how lfconvert detects non-local repos
Greg Ward <greg@gerg.ca>
parents:
15339
diff
changeset
|
203 abort: ssh://localhost/foo is not a local Mercurial repo |
0e58513cc59a
largefiles: rearrange how lfconvert detects non-local repos
Greg Ward <greg@gerg.ca>
parents:
15339
diff
changeset
|
204 [255] |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
205 $ hg lfconvert nosuchrepo foo |
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
206 abort: repository nosuchrepo not found! |
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
207 [255] |
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
208 $ hg share -q -U bigfile-repo shared |
15364
572c22c88be6
tests: fix check-code detection of anchored expressions, fix echo -n usage
Matt Mackall <mpm@selenic.com>
parents:
15343
diff
changeset
|
209 $ printf 'bogus' > shared/.hg/sharedpath |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
210 $ hg lfconvert shared foo |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15389
diff
changeset
|
211 abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! (glob) |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
212 [255] |
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
213 $ hg lfconvert bigfile-repo largefiles-repo |
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
214 initializing destination largefiles-repo |
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
215 abort: repository largefiles-repo already exists! |
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
216 [255] |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
217 |
15343
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
218 add another largefile to the new largefiles repo |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
219 $ cd largefiles-repo |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
220 $ dd if=/dev/zero bs=1k count=1k > anotherlarge 2> /dev/null |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
221 $ hg add --lfsize=1 anotherlarge |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
222 $ hg commit -m "add anotherlarge (should be a largefile)" |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
223 $ cat .hglf/anotherlarge |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
224 3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
225 $ cd .. |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
226 |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
227 round-trip: converting back to a normal (non-largefiles) repo with |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
228 "lfconvert --to-normal" should give the same as ../bigfile-repo |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
229 $ cd largefiles-repo |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
230 $ hg lfconvert --to-normal . ../normal-repo |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
231 initializing destination ../normal-repo |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
232 $ cd ../normal-repo |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
233 $ cat >> .hg/hgrc <<EOF |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
234 > [extensions] |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
235 > largefiles = ! |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
236 > EOF |
15343
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
237 |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
238 # Hmmm: the changeset ID for rev 5 is different from the original |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
239 # normal repo (../bigfile-repo), because the changelog filelist |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
240 # differs between the two incarnations of rev 5: this repo includes |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
241 # 'large' in the list, but ../bigfile-repo does not. Since rev 5 |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
242 # removes 'large' relative to the first parent in both repos, it seems |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
243 # to me that lfconvert is doing a *better* job than |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
244 # "hg remove" + "hg merge" + "hg commit". |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
245 # $ hg -R ../bigfile-repo debugdata -c 5 |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
246 # $ hg debugdata -c 5 |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
247 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n" |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
248 o 6:1635824e6f59 add anotherlarge (should be a largefile) |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
249 | |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
250 o 5:7215f8deeaaf merge |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
251 |\ |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
252 | o 4:7285f817b77e remove large, normal3 |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
253 | | |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
254 | o 3:67e3892e3534 add normal3, modify sub/* |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
255 | | |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
256 o | 2:c96c8beb5d56 rename sub/ to stuff/ |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
257 |/ |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
258 o 1:020c65d24e11 add sub/* |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
259 | |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
260 o 0:117b8328f97a add large, normal1 |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
261 |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
262 $ hg update |
15343
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
263 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
264 $ hg locate |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
265 anotherlarge |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
266 normal1 |
15343
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
267 stuff/maybelarge.dat |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
268 stuff/normal2 |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
269 $ [ -d .hg/largefiles ] && echo fail || echo pass |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
270 pass |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16908
diff
changeset
|
271 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16908
diff
changeset
|
272 $ cd .. |