annotate tests/test-convert-bzr.t @ 15718:c604a3d1969d

icasefs: disuse length check against un-normcase()-ed filenames this patch disuses length check against un-normcase()-ed filenames gotten by "os.listdir()", because there is no assurance that filesystem stores filenames normalized except in letter case, even though some case insensitive filesystems (in some environment, for some language setting) store them in such manner.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 24 Dec 2011 00:50:56 +0900
parents db0340f4b507
children f84dda152a55
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15442
db0340f4b507 tests: use 'hghave execbit' for tests that manipulate x bit in file system
Mads Kiilerich <mads@kiilerich.com>
parents: 15441
diff changeset
1 $ "$TESTDIR/hghave" symlink execbit || exit 80
12512
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
2
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
3 $ . "$TESTDIR/bzr-definitions"
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
4
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
5 create and rename on the same file in the same step
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
6
12512
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
7 $ mkdir test-createandrename
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
8 $ cd test-createandrename
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
9 $ bzr init -q source
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
10 $ cd source
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
11 $ echo a > a
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
12 $ echo c > c
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
13 $ echo e > e
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
14 $ bzr add -q a c e
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
15 $ bzr commit -q -m 'Initial add: a, c, e'
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
16 $ bzr mv a b
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
17 a => b
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
18 $ bzr mv c d
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
19 c => d
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
20 $ bzr mv e f
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
21 e => f
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
22 $ echo a2 >> a
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
23 $ mkdir e
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
24 $ bzr add -q a e
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
25 $ bzr commit -q -m 'rename a into b, create a, rename c into d'
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
26 $ cd ..
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
27 $ hg convert source source-hg
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
28 initializing destination source-hg repository
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
29 scanning source...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
30 sorting...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
31 converting...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
32 1 Initial add: a, c, e
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
33 0 rename a into b, create a, rename c into d
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
34 $ glog -R source-hg
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
35 o 1 "rename a into b, create a, rename c into d" files: a b c d e f
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
36 |
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
37 o 0 "Initial add: a, c, e" files: a c e
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
38
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
39
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
40 manifest
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
41
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
42 $ hg manifest -R source-hg -r tip
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
43 a
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
44 b
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
45 d
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
46 f
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
47
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
48 test --rev option
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
49
12512
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
50 $ hg convert -r 1 source source-1-hg
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
51 initializing destination source-1-hg repository
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
52 scanning source...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
53 sorting...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
54 converting...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
55 0 Initial add: a, c, e
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
56 $ glog -R source-1-hg
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
57 o 0 "Initial add: a, c, e" files: a c e
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
58
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
59
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
60 test with filemap
8305
7a0fcdd3828f convert/bzr: handle Bazaar timestamps correctly (issue1652).
Greg Ward <greg-hg@gerg.ca>
parents: 8165
diff changeset
61
12512
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
62 $ cat > filemap <<EOF
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
63 > exclude a
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
64 > EOF
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
65 $ hg convert --filemap filemap source source-filemap-hg
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
66 initializing destination source-filemap-hg repository
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
67 scanning source...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
68 sorting...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
69 converting...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
70 1 Initial add: a, c, e
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
71 0 rename a into b, create a, rename c into d
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
72 $ hg -R source-filemap-hg manifest -r tip
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
73 b
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
74 d
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
75 f
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
76
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
77 convert from lightweight checkout
8470
dd24488cba2d convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents: 8434
diff changeset
78
12512
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
79 $ bzr checkout --lightweight source source-light
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
80 $ hg convert source-light source-light-hg
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
81 initializing destination source-light-hg repository
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
82 warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
83 scanning source...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
84 sorting...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
85 converting...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
86 1 Initial add: a, c, e
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
87 0 rename a into b, create a, rename c into d
8305
7a0fcdd3828f convert/bzr: handle Bazaar timestamps correctly (issue1652).
Greg Ward <greg-hg@gerg.ca>
parents: 8165
diff changeset
88
12512
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
89 lightweight manifest
8305
7a0fcdd3828f convert/bzr: handle Bazaar timestamps correctly (issue1652).
Greg Ward <greg-hg@gerg.ca>
parents: 8165
diff changeset
90
12512
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
91 $ hg manifest -R source-light-hg -r tip
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
92 a
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
93 b
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
94 d
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
95 f
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
96
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
97 extract timestamps that look just like hg's {date|isodate}:
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
98 yyyy-mm-dd HH:MM zzzz (no seconds!)
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
99 compare timestamps
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
100
12512
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
101 $ cd source
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
102 $ bzr log | \
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
103 > sed '/timestamp/!d;s/.\{15\}\([0-9: -]\{16\}\):.. \(.[0-9]\{4\}\)/\1 \2/' \
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
104 > > ../bzr-timestamps
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
105 $ cd ..
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
106 $ hg -R source-hg log --template "{date|isodate}\n" > hg-timestamps
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
107 $ diff -u bzr-timestamps hg-timestamps
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
108 $ cd ..
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
109
12512
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
110 merge
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
111
12512
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
112 $ mkdir test-merge
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
113 $ cd test-merge
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
114 $ cat > helper.py <<EOF
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
115 > import sys
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
116 > from bzrlib import workingtree
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
117 > wt = workingtree.WorkingTree.open('.')
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
118 >
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
119 > message, stamp = sys.argv[1:]
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
120 > wt.commit(message, timestamp=int(stamp))
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
121 > EOF
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
122 $ bzr init -q source
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
123 $ cd source
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
124 $ echo content > a
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
125 $ echo content2 > b
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
126 $ bzr add -q a b
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
127 $ bzr commit -q -m 'Initial add'
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
128 $ cd ..
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
129 $ bzr branch -q source source-improve
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
130 $ cd source
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
131 $ echo more >> a
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
132 $ python ../helper.py 'Editing a' 100
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
133 $ cd ../source-improve
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
134 $ echo content3 >> b
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
135 $ python ../helper.py 'Editing b' 200
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
136 $ cd ../source
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
137 $ bzr merge -q ../source-improve
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
138 $ bzr commit -q -m 'Merged improve branch'
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
139 $ cd ..
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
140 $ hg convert --datesort source source-hg
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
141 initializing destination source-hg repository
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
142 scanning source...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
143 sorting...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
144 converting...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
145 3 Initial add
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
146 2 Editing a
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
147 1 Editing b
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
148 0 Merged improve branch
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
149 $ glog -R source-hg
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
150 o 3 "Merged improve branch" files:
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
151 |\
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
152 | o 2 "Editing b" files: b
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
153 | |
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
154 o | 1 "Editing a" files: a
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
155 |/
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
156 o 0 "Initial add" files: a b
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
157
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
158 $ cd ..
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
159
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
160 symlinks and executable files
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
161
12512
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
162 $ mkdir test-symlinks
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
163 $ cd test-symlinks
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
164 $ bzr init -q source
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
165 $ cd source
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
166 $ touch program
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
167 $ chmod +x program
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
168 $ ln -s program altname
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
169 $ mkdir d
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
170 $ echo a > d/a
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
171 $ ln -s a syma
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
172 $ bzr add -q altname program syma d/a
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
173 $ bzr commit -q -m 'Initial setup'
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
174 $ touch newprog
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
175 $ chmod +x newprog
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
176 $ rm altname
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
177 $ ln -s newprog altname
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
178 $ chmod -x program
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
179 $ bzr add -q newprog
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
180 $ bzr commit -q -m 'Symlink changed, x bits changed'
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
181 $ cd ..
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
182 $ hg convert source source-hg
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
183 initializing destination source-hg repository
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
184 scanning source...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
185 sorting...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
186 converting...
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
187 1 Initial setup
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
188 0 Symlink changed, x bits changed
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
189 $ manifest source-hg 0
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
190 % manifest of 0
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
191 644 @ altname
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
192 644 d/a
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
193 755 * program
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
194 644 @ syma
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
195 $ manifest source-hg tip
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
196 % manifest of tip
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
197 644 @ altname
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
198 644 d/a
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
199 755 * newprog
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
200 644 program
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
201 644 @ syma
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
202 $ cd source-hg
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
203
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
204 test the symlinks can be recreated
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
205
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
206 $ hg up
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
207 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
208 $ hg cat syma; echo
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
209 a
8d84166d34d7 tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents: 8470
diff changeset
210