Mercurial > hg
annotate tests/test-convert-bzr.t @ 27279:40eb385f798f
tests: add test for Python 3 compatibility
Python 3 is inevitable. There have been incremental movements towards
converting the code base to be Python 3 compatible. Unfortunately, we
don't have any tests that look for Python 3 compatibility. This patch
changes that.
We introduce a check-py3-compat.py script whose role is to verify
Python 3 compatibility of the files passed in. We add a test that
calls this script with all .py files from the source checkout.
The script currently only verifies that absolute_import and
print_function are used. These are the low hanging fruits for Python
compatbility. Over time, we can include more checks, including
verifying we're able to load each Python file with Python 3. You
have to start somewhere.
Accepting this patch means that all new .py files must have
absolute_import and print_function (if "print" is used) to avoid
a new warning about Python 3 incompatibility. We've already
converted several files to use absolute_import and print_function
is in the same boat, so I don't think this is such a radical
proposition.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sun, 06 Dec 2015 22:39:12 -0800 |
parents | 89872688893f |
children | 75be14993fda |
rev | line source |
---|---|
26066
89872688893f
tests: move '#require bzr' into .t files
Gregory Szorc <gregory.szorc@gmail.com>
parents:
20598
diff
changeset
|
1 #require bzr |
89872688893f
tests: move '#require bzr' into .t files
Gregory Szorc <gregory.szorc@gmail.com>
parents:
20598
diff
changeset
|
2 |
12512
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 | 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 |
16061
915e06faa8f3
convert/bzr: handle empty bzr repositories (issue3233)
Patrick Mezard <pmezard@gmail.com>
parents:
16060
diff
changeset
|
10 |
915e06faa8f3
convert/bzr: handle empty bzr repositories (issue3233)
Patrick Mezard <pmezard@gmail.com>
parents:
16060
diff
changeset
|
11 test empty repo conversion (issue3233) |
915e06faa8f3
convert/bzr: handle empty bzr repositories (issue3233)
Patrick Mezard <pmezard@gmail.com>
parents:
16060
diff
changeset
|
12 |
915e06faa8f3
convert/bzr: handle empty bzr repositories (issue3233)
Patrick Mezard <pmezard@gmail.com>
parents:
16060
diff
changeset
|
13 $ hg convert source source-hg |
915e06faa8f3
convert/bzr: handle empty bzr repositories (issue3233)
Patrick Mezard <pmezard@gmail.com>
parents:
16060
diff
changeset
|
14 initializing destination source-hg repository |
915e06faa8f3
convert/bzr: handle empty bzr repositories (issue3233)
Patrick Mezard <pmezard@gmail.com>
parents:
16060
diff
changeset
|
15 scanning source... |
915e06faa8f3
convert/bzr: handle empty bzr repositories (issue3233)
Patrick Mezard <pmezard@gmail.com>
parents:
16060
diff
changeset
|
16 sorting... |
915e06faa8f3
convert/bzr: handle empty bzr repositories (issue3233)
Patrick Mezard <pmezard@gmail.com>
parents:
16060
diff
changeset
|
17 converting... |
915e06faa8f3
convert/bzr: handle empty bzr repositories (issue3233)
Patrick Mezard <pmezard@gmail.com>
parents:
16060
diff
changeset
|
18 |
915e06faa8f3
convert/bzr: handle empty bzr repositories (issue3233)
Patrick Mezard <pmezard@gmail.com>
parents:
16060
diff
changeset
|
19 back to the rename stuff |
915e06faa8f3
convert/bzr: handle empty bzr repositories (issue3233)
Patrick Mezard <pmezard@gmail.com>
parents:
16060
diff
changeset
|
20 |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
21 $ cd source |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
22 $ echo a > a |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
23 $ echo c > c |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
24 $ echo e > e |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
25 $ bzr add -q a c e |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
26 $ bzr commit -q -m 'Initial add: a, c, e' |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
27 $ bzr mv a b |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
28 a => b |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
29 $ bzr mv c d |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
30 c => d |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
31 $ bzr mv e f |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
32 e => f |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
33 $ echo a2 >> a |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
34 $ mkdir e |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
35 $ bzr add -q a e |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
36 $ 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
|
37 $ cd .. |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
38 $ hg convert source source-hg |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
39 scanning source... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
40 sorting... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
41 converting... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
42 1 Initial add: a, c, e |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
43 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
|
44 $ glog -R source-hg |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
45 o 1@source "rename a into b, create a, rename c into d" files: a b c d e f |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
46 | |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
47 o 0@source "Initial add: a, c, e" files: a c e |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
48 |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
49 |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
50 manifest |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
51 |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
52 $ hg manifest -R source-hg -r tip |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
53 a |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
54 b |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
55 d |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
56 f |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
57 |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
58 test --rev option |
7053 | 59 |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
60 $ hg convert -r 1 source source-1-hg |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
61 initializing destination source-1-hg repository |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
62 scanning source... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
63 sorting... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
64 converting... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
65 0 Initial add: a, c, e |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
66 $ glog -R source-1-hg |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
67 o 0@source "Initial add: a, c, e" files: a c e |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
68 |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
69 |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
70 test with filemap |
8305
7a0fcdd3828f
convert/bzr: handle Bazaar timestamps correctly (issue1652).
Greg Ward <greg-hg@gerg.ca>
parents:
8165
diff
changeset
|
71 |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
72 $ cat > filemap <<EOF |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
73 > exclude a |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
74 > EOF |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
75 $ hg convert --filemap filemap source source-filemap-hg |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
76 initializing destination source-filemap-hg repository |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
77 scanning source... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
78 sorting... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
79 converting... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
80 1 Initial add: a, c, e |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
81 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
|
82 $ hg -R source-filemap-hg manifest -r tip |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
83 b |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
84 d |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
85 f |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
86 |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
87 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
|
88 |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
89 $ bzr checkout --lightweight source source-light |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
90 $ hg convert -s bzr source-light source-light-hg |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
91 initializing destination source-light-hg repository |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
92 warning: lightweight checkouts may cause conversion failures, try with a regular branch instead. |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
93 $TESTTMP/test-createandrename/source-light does not look like a Bazaar repository |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
94 abort: source-light: missing or unsupported repository |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
95 [255] |
12512
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 | 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 |
20598
e57e2da803aa
solaris: diff -u emits "No differences encountered"
Danek Duvall <danek.duvall@oracle.com>
parents:
17097
diff
changeset
|
107 $ cmp bzr-timestamps hg-timestamps || diff -u bzr-timestamps hg-timestamps |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
108 $ cd .. |
7053 | 109 |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
110 merge |
7053 | 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 |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
150 o 3@source "Merged improve branch" files: |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
151 |\ |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
152 | o 2@source-improve "Editing b" files: b |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
153 | | |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
154 o | 1@source "Editing a" files: a |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
155 |/ |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
156 o 0@source "Initial add" files: a b |
12512
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 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16099
diff
changeset
|
160 #if symlink execbit |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16099
diff
changeset
|
161 |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
162 symlinks and executable files |
7053 | 163 |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
164 $ mkdir test-symlinks |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
165 $ cd test-symlinks |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
166 $ bzr init -q source |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
167 $ cd source |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
168 $ touch program |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
169 $ chmod +x program |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
170 $ ln -s program altname |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
171 $ mkdir d |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
172 $ echo a > d/a |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
173 $ ln -s a syma |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
174 $ bzr add -q altname program syma d/a |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
175 $ bzr commit -q -m 'Initial setup' |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
176 $ touch newprog |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
177 $ chmod +x newprog |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
178 $ rm altname |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
179 $ ln -s newprog altname |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
180 $ chmod -x program |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
181 $ bzr add -q newprog |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
182 $ bzr commit -q -m 'Symlink changed, x bits changed' |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
183 $ cd .. |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
184 $ hg convert source source-hg |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
185 initializing destination source-hg repository |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
186 scanning source... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
187 sorting... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
188 converting... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
189 1 Initial setup |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
190 0 Symlink changed, x bits changed |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
191 $ manifest source-hg 0 |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
192 % manifest of 0 |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
193 644 @ altname |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
194 644 d/a |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
195 755 * program |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
196 644 @ syma |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
197 $ manifest source-hg tip |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
198 % manifest of tip |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
199 644 @ altname |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
200 644 d/a |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
201 755 * newprog |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
202 644 program |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
203 644 @ syma |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
204 |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
205 test the symlinks can be recreated |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
206 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16099
diff
changeset
|
207 $ cd source-hg |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
208 $ hg up |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
209 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
|
210 $ hg cat syma; echo |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
211 a |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16099
diff
changeset
|
212 $ cd ../.. |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16099
diff
changeset
|
213 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16099
diff
changeset
|
214 #endif |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
215 |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
216 Multiple branches |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
217 |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
218 $ bzr init-repo -q --no-trees repo |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
219 $ bzr init -q repo/trunk |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
220 $ bzr co repo/trunk repo-trunk |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
221 $ cd repo-trunk |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
222 $ echo a > a |
17034
75fd9d1cf638
convert/bzr: make tests work with bzr 2.0 again
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16099
diff
changeset
|
223 $ bzr add -q a |
75fd9d1cf638
convert/bzr: make tests work with bzr 2.0 again
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16099
diff
changeset
|
224 $ bzr ci -qm adda |
16062
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
225 $ bzr tag trunk-tag |
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
226 Created tag trunk-tag. |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
227 $ bzr switch -b branch |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
228 Tree is up to date at revision 1. |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
229 Switched to branch: *repo/branch/ (glob) |
17097
885542e7d9b6
tests: make test-convert-bzr.t more stable
Mads Kiilerich <mads@kiilerich.com>
parents:
17036
diff
changeset
|
230 $ sleep 1 |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
231 $ echo b > b |
17034
75fd9d1cf638
convert/bzr: make tests work with bzr 2.0 again
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16099
diff
changeset
|
232 $ bzr add -q b |
75fd9d1cf638
convert/bzr: make tests work with bzr 2.0 again
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16099
diff
changeset
|
233 $ bzr ci -qm addb |
16062
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
234 $ bzr tag branch-tag |
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
235 Created tag branch-tag. |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
236 $ bzr switch --force ../repo/trunk |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
237 Updated to revision 1. |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
238 Switched to branch: */repo/trunk/ (glob) |
17097
885542e7d9b6
tests: make test-convert-bzr.t more stable
Mads Kiilerich <mads@kiilerich.com>
parents:
17036
diff
changeset
|
239 $ sleep 1 |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
240 $ echo a >> a |
17034
75fd9d1cf638
convert/bzr: make tests work with bzr 2.0 again
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16099
diff
changeset
|
241 $ bzr ci -qm changea |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
242 $ cd .. |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
243 $ hg convert --datesort repo repo-bzr |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
244 initializing destination repo-bzr repository |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
245 scanning source... |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
246 sorting... |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
247 converting... |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
248 2 adda |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
249 1 addb |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
250 0 changea |
16062
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
251 updating tags |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
252 $ (cd repo-bzr; glog) |
16062
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
253 o 3@default "update tags" files: .hgtags |
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
254 | |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
255 o 2@default "changea" files: a |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
256 | |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
257 | o 1@branch "addb" files: b |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
258 |/ |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
259 o 0@default "adda" files: a |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
260 |
16062
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
261 |
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
262 Test tags (converted identifiers are not stable because bzr ones are |
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
263 not and get incorporated in extra fields). |
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
264 |
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
265 $ hg -R repo-bzr tags |
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
266 tip 3:* (glob) |
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
267 branch-tag 1:* (glob) |
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
268 trunk-tag 0:* (glob) |
16099
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
269 |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
270 Nested repositories (issue3254) |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
271 |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
272 $ bzr init-repo -q --no-trees repo/inner |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
273 $ bzr init -q repo/inner/trunk |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
274 $ bzr co repo/inner/trunk inner-trunk |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
275 $ cd inner-trunk |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
276 $ echo b > b |
17034
75fd9d1cf638
convert/bzr: make tests work with bzr 2.0 again
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16099
diff
changeset
|
277 $ bzr add -q b |
16099
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
278 $ bzr ci -qm addb |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
279 $ cd .. |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
280 $ hg convert --datesort repo noinner-bzr |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
281 initializing destination noinner-bzr repository |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
282 scanning source... |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
283 sorting... |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
284 converting... |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
285 2 adda |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
286 1 addb |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
287 0 changea |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
288 updating tags |