annotate tests/test-convert-bzr-directories.t @ 19424:762e51ce3411

gendoc: add showtopic This function prints any topic.
author Takumi IINO <trot.thunder@gmail.com>
date Wed, 03 Jul 2013 21:49:39 +0900
parents 3c72117a7a0e
children 89872688893f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
1
12514
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
2 $ . "$TESTDIR/bzr-definitions"
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
3
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
4 empty directory
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
5
12514
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
6 $ mkdir test-empty
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
7 $ cd test-empty
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
8 $ bzr init -q source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
9 $ cd source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
10 $ echo content > a
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
11 $ bzr add -q a
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
12 $ bzr commit -q -m 'Initial add'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
13 $ mkdir empty
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
14 $ bzr add -q empty
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
15 $ bzr commit -q -m 'Empty directory added'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
16 $ echo content > empty/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
17 $ bzr add -q empty/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
18 $ bzr commit -q -m 'Added file into directory'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
19 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
20 $ hg convert source source-hg
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
21 initializing destination source-hg repository
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
22 scanning source...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
23 sorting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
24 converting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
25 2 Initial add
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
26 1 Empty directory added
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
27 0 Added file into directory
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
28 $ manifest source-hg 1
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
29 % manifest of 1
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
30 644 a
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
31 $ manifest source-hg tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
32 % manifest of tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
33 644 a
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
34 644 empty/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
35 $ cd ..
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
36
12514
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
37 directory renames
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
38
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
39 $ mkdir test-dir-rename
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
40 $ cd test-dir-rename
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
41 $ bzr init -q source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
42 $ cd source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
43 $ mkdir tpyo
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
44 $ echo content > tpyo/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
45 $ bzr add -q tpyo
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
46 $ bzr commit -q -m 'Added directory'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
47 $ bzr mv tpyo typo
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
48 tpyo => typo
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
49 $ bzr commit -q -m 'Oops, typo'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
50 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
51 $ hg convert source source-hg
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
52 initializing destination source-hg repository
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
53 scanning source...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
54 sorting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
55 converting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
56 1 Added directory
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
57 0 Oops, typo
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
58 $ manifest source-hg 0
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
59 % manifest of 0
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
60 644 tpyo/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
61 $ manifest source-hg tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
62 % manifest of tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
63 644 typo/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
64 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
65
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
66 nested directory renames
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
67
12514
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
68 $ mkdir test-nested-dir-rename
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
69 $ cd test-nested-dir-rename
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
70 $ bzr init -q source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
71 $ cd source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
72 $ mkdir -p firstlevel/secondlevel/thirdlevel
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
73 $ echo content > firstlevel/secondlevel/file
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
74 $ echo this_needs_to_be_there_too > firstlevel/secondlevel/thirdlevel/stuff
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
75 $ bzr add -q firstlevel
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
76 $ bzr commit -q -m 'Added nested directories'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
77 $ bzr mv firstlevel/secondlevel secondlevel
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
78 firstlevel/secondlevel => secondlevel
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
79 $ bzr commit -q -m 'Moved secondlevel one level up'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
80 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
81 $ hg convert source source-hg
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
82 initializing destination source-hg repository
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
83 scanning source...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
84 sorting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
85 converting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
86 1 Added nested directories
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
87 0 Moved secondlevel one level up
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
88 $ manifest source-hg tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
89 % manifest of tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
90 644 secondlevel/file
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
91 644 secondlevel/thirdlevel/stuff
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
92 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
93
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
94 directory remove
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
95
12514
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
96 $ mkdir test-dir-remove
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
97 $ cd test-dir-remove
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
98 $ bzr init -q source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
99 $ cd source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
100 $ mkdir src
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
101 $ echo content > src/sourcecode
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
102 $ bzr add -q src
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
103 $ bzr commit -q -m 'Added directory'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
104 $ bzr rm -q src
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
105 $ bzr commit -q -m 'Removed directory'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
106 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
107 $ hg convert source source-hg
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
108 initializing destination source-hg repository
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
109 scanning source...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
110 sorting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
111 converting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
112 1 Added directory
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
113 0 Removed directory
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
114 $ manifest source-hg 0
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
115 % manifest of 0
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
116 644 src/sourcecode
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
117 $ manifest source-hg tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
118 % manifest of tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
119 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
120
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
121 directory replace
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
122
12514
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
123 $ mkdir test-dir-replace
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
124 $ cd test-dir-replace
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
125 $ bzr init -q source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
126 $ cd source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
127 $ mkdir first second
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
128 $ echo content > first/file
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
129 $ echo morecontent > first/dummy
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
130 $ echo othercontent > second/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
131 $ bzr add -q first second
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
132 $ bzr commit -q -m 'Initial layout'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
133 $ bzr mv first/file second/file
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
134 first/file => second/file
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
135 $ bzr mv first third
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
136 first => third
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
137 $ bzr commit -q -m 'Some conflicting moves'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
138 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
139 $ hg convert source source-hg
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
140 initializing destination source-hg repository
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
141 scanning source...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
142 sorting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
143 converting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
144 1 Initial layout
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
145 0 Some conflicting moves
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
146 $ manifest source-hg tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
147 % manifest of tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
148 644 second/file
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
149 644 second/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
150 644 third/dummy
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
151 $ cd ..
15461
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
152
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
153 divergent nested renames (issue3089)
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
154
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
155 $ mkdir test-divergent-renames
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
156 $ cd test-divergent-renames
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
157 $ bzr init -q source
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
158 $ cd source
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
159 $ mkdir -p a/c
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
160 $ echo a > a/fa
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
161 $ echo c > a/c/fc
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
162 $ bzr add -q a
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
163 $ bzr commit -q -m 'Initial layout'
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
164 $ bzr mv a b
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
165 a => b
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
166 $ mkdir a
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
167 $ bzr add a
15487
3c72117a7a0e convert/bzr: fix test of divergent nested renames for bzr 1.x
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15461
diff changeset
168 add(ed|ing) a (re)
15461
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
169 $ bzr mv b/c a/c
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
170 b/c => a/c
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
171 $ bzr status
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
172 added:
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
173 a/
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
174 renamed:
15487
3c72117a7a0e convert/bzr: fix test of divergent nested renames for bzr 1.x
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15461
diff changeset
175 a/? => b/? (re)
3c72117a7a0e convert/bzr: fix test of divergent nested renames for bzr 1.x
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15461
diff changeset
176 a/c/? => a/c/? (re)
15461
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
177 $ bzr commit -q -m 'Divergent renames'
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
178 $ cd ..
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
179 $ hg convert source source-hg
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
180 initializing destination source-hg repository
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
181 scanning source...
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
182 sorting...
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
183 converting...
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
184 1 Initial layout
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
185 0 Divergent renames
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
186 $ hg -R source-hg st -C --change 1
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
187 A b/fa
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
188 a/fa
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
189 R a/fa
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
190 $ hg -R source-hg manifest -r 1
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
191 a/c/fc
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
192 b/fa
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
193 $ cd ..