author | Arseniy Alekseyev <aalekseyev@janestreet.com> |
Thu, 01 Jun 2023 17:39:22 +0100 | |
changeset 50706 | 0452af304808 |
parent 47377 | 26127236b229 |
child 51843 | fe08a0bfa9fd |
permissions | -rw-r--r-- |
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 |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
9 |
$ brz 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 |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
25 |
$ brz add -q a c e |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
26 |
$ brz commit -q -m 'Initial add: a, c, e' |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
27 |
$ brz mv a b |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
28 |
a => b |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
29 |
$ brz mv c d |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
30 |
c => d |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
31 |
$ brz mv e f |
12512
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 |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
35 |
$ brz add -q a e |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
36 |
$ brz commit -q -m 'rename a into b, create a, rename c into d' |
12512
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 |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
45 |
o 1@source "rename a into b, create a, rename c into d" files+: [b d f], files-: [c e], files: [a] |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
46 |
| |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
47 |
o 0@source "Initial add: a, c, e" files+: [a c e], files-: [], files: [] |
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 |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
67 |
o 0@source "Initial add: a, c, e" files+: [a c e], files-: [], files: [] |
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 |
|
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
89 |
$ brz 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 |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
102 |
$ brz log | \ |
12512
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 |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
116 |
> from breezy import workingtree |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
117 |
> import breezy.bzr.bzrdir |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
118 |
> wt = workingtree.WorkingTree.open('.') |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
119 |
> |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
120 |
> message, stamp = sys.argv[1:] |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
121 |
> wt.commit(message, timestamp=int(stamp)) |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
122 |
> EOF |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
123 |
$ brz init -q source |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
124 |
$ cd source |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
125 |
$ echo content > a |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
126 |
$ echo content2 > b |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
127 |
$ brz add -q a b |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
128 |
$ brz commit -q -m 'Initial add' |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
129 |
$ cd .. |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
130 |
$ brz branch -q source source-improve |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
131 |
$ cd source |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
132 |
$ echo more >> a |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39222
diff
changeset
|
133 |
$ "$PYTHON" ../helper.py 'Editing a' 100 |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
134 |
$ cd ../source-improve |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
135 |
$ echo content3 >> b |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39222
diff
changeset
|
136 |
$ "$PYTHON" ../helper.py 'Editing b' 200 |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
137 |
$ cd ../source |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
138 |
$ brz merge -q ../source-improve |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
139 |
$ brz commit -q -m 'Merged improve branch' |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
140 |
$ cd .. |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
141 |
$ hg convert --datesort source source-hg |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
142 |
initializing destination source-hg repository |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
143 |
scanning source... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
144 |
sorting... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
145 |
converting... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
146 |
3 Initial add |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
147 |
2 Editing a |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
148 |
1 Editing b |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
149 |
0 Merged improve branch |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
150 |
$ glog -R source-hg |
42405
0c72eddb4be5
templatekw: make {file_*} compare to both merge parents (issue4292)
Martin von Zweigbergk <martinvonz@google.com>
parents:
39707
diff
changeset
|
151 |
o 3@source "Merged improve branch" files+: [], files-: [], files: [] |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
152 |
|\ |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
153 |
| o 2@source-improve "Editing b" files+: [], files-: [], files: [b] |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
154 |
| | |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
155 |
o | 1@source "Editing a" files+: [], files-: [], files: [a] |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
156 |
|/ |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
157 |
o 0@source "Initial add" files+: [a b], files-: [], files: [] |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
158 |
|
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
159 |
$ cd .. |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
160 |
|
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16099
diff
changeset
|
161 |
#if symlink execbit |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16099
diff
changeset
|
162 |
|
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
163 |
symlinks and executable files |
7053 | 164 |
|
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
165 |
$ mkdir test-symlinks |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
166 |
$ cd test-symlinks |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
167 |
$ brz init -q source |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
168 |
$ cd source |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
169 |
$ touch program |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
170 |
$ chmod +x program |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
171 |
$ ln -s program altname |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
172 |
$ mkdir d |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
173 |
$ echo a > d/a |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
174 |
$ ln -s a syma |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
175 |
$ brz add -q altname program syma d/a |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
176 |
$ brz commit -q -m 'Initial setup' |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
177 |
$ touch newprog |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
178 |
$ chmod +x newprog |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
179 |
$ rm altname |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
180 |
$ ln -s newprog altname |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
181 |
$ chmod -x program |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
182 |
$ brz add -q newprog |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
183 |
$ brz commit -q -m 'Symlink changed, x bits changed' |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
184 |
$ cd .. |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
185 |
$ hg convert source source-hg |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
186 |
initializing destination source-hg repository |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
187 |
scanning source... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
188 |
sorting... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
189 |
converting... |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
190 |
1 Initial setup |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
191 |
0 Symlink changed, x bits changed |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
192 |
$ manifest source-hg 0 |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
193 |
% manifest of 0 |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
194 |
644 @ altname |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
195 |
644 d/a |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
196 |
755 * program |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
197 |
644 @ syma |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
198 |
$ manifest source-hg tip |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
199 |
% manifest of tip |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
200 |
644 @ altname |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
201 |
644 d/a |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
202 |
755 * newprog |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
203 |
644 program |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
204 |
644 @ syma |
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 |
test the symlinks can be recreated |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
207 |
|
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16099
diff
changeset
|
208 |
$ cd source-hg |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
209 |
$ hg up |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
210 |
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
|
211 |
$ hg cat syma; echo |
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
212 |
a |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16099
diff
changeset
|
213 |
$ cd ../.. |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16099
diff
changeset
|
214 |
|
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16099
diff
changeset
|
215 |
#endif |
12512
8d84166d34d7
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com>
parents:
8470
diff
changeset
|
216 |
|
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
217 |
Multiple branches |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
218 |
|
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
219 |
$ brz init-repo -q --no-trees repo |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
220 |
$ brz init -q repo/trunk |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
221 |
$ brz co repo/trunk repo-trunk |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
222 |
$ cd repo-trunk |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
223 |
$ echo a > a |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
224 |
$ brz add -q a |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
225 |
$ brz ci -qm adda |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
226 |
$ brz tag trunk-tag |
16062
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
227 |
Created tag trunk-tag. |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
228 |
$ brz switch -b branch |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
229 |
Tree is up to date at revision 1. |
44324
84d98fa814a8
tests: accept new bzr message about switching branches
Martin von Zweigbergk <martinvonz@google.com>
parents:
42405
diff
changeset
|
230 |
Switched to branch*repo/branch/ (glob) |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
231 |
$ echo b > b |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
232 |
$ brz add -q b |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
233 |
$ brz ci -qm addb |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
234 |
$ brz tag branch-tag |
16062
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
235 |
Created tag branch-tag. |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
236 |
$ brz switch --force ../repo/trunk |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
237 |
Updated to revision 1. |
44324
84d98fa814a8
tests: accept new bzr message about switching branches
Martin von Zweigbergk <martinvonz@google.com>
parents:
42405
diff
changeset
|
238 |
Switched to branch*/repo/trunk/ (glob) |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
239 |
$ echo a >> a |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
240 |
$ brz ci -qm changea |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
241 |
$ cd .. |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
242 |
$ hg convert --datesort repo repo-bzr |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
243 |
initializing destination repo-bzr repository |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
244 |
scanning source... |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
245 |
sorting... |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
246 |
converting... |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
247 |
2 adda |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
248 |
1 addb |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
249 |
0 changea |
16062
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
250 |
updating tags |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
251 |
$ (cd repo-bzr; glog) |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
252 |
o 3@default "update tags" files+: [.hgtags], files-: [], files: [] |
16062
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
253 |
| |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
254 |
o 2@default "changea" files+: [], files-: [], files: [a] |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
255 |
| |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
256 |
| o 1@branch "addb" files+: [b], files-: [], files: [] |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
257 |
|/ |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
258 |
o 0@default "adda" files+: [a], files-: [], files: [] |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
15442
diff
changeset
|
259 |
|
16062
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
260 |
|
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
261 |
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
|
262 |
not and get incorporated in extra fields). |
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
263 |
|
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
264 |
$ hg -R repo-bzr tags |
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
265 |
tip 3:* (glob) |
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
266 |
branch-tag 1:* (glob) |
718b81e8b876
convert/bzr: test tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
16061
diff
changeset
|
267 |
trunk-tag 0:* (glob) |
16099
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
268 |
|
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
269 |
Nested repositories (issue3254) |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
270 |
|
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
271 |
$ brz init-repo -q --no-trees repo/inner |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
272 |
$ brz init -q repo/inner/trunk |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
273 |
$ brz co repo/inner/trunk inner-trunk |
16099
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
274 |
$ cd inner-trunk |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
275 |
$ echo b > b |
47377
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
276 |
$ brz add -q b |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
44324
diff
changeset
|
277 |
$ brz ci -qm addb |
16099
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
278 |
$ cd .. |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
279 |
$ 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
|
280 |
initializing destination noinner-bzr repository |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
281 |
scanning source... |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
282 |
sorting... |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
283 |
converting... |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
284 |
2 adda |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
285 |
1 addb |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
286 |
0 changea |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16062
diff
changeset
|
287 |
updating tags |