Show More
| @@ -1,194 +1,197 b'' | |||||
| 1 | #require bzr |
|
1 | #require bzr | |
| 2 |
|
2 | |||
| 3 | $ . "$TESTDIR/bzr-definitions" |
|
3 | $ . "$TESTDIR/bzr-definitions" | |
| 4 |
|
4 | |||
|
|
5 | Work around https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=944379 | |||
|
|
6 | $ mkdir -p "${HOME}/.config/breezy" | |||
|
|
7 | ||||
| 5 | empty directory |
|
8 | empty directory | |
| 6 |
|
9 | |||
| 7 | $ mkdir test-empty |
|
10 | $ mkdir test-empty | |
| 8 | $ cd test-empty |
|
11 | $ cd test-empty | |
| 9 | $ bzr init -q source |
|
12 | $ bzr init -q source | |
| 10 | $ cd source |
|
13 | $ cd source | |
| 11 | $ echo content > a |
|
14 | $ echo content > a | |
| 12 | $ bzr add -q a |
|
15 | $ bzr add -q a | |
| 13 | $ bzr commit -q -m 'Initial add' |
|
16 | $ bzr commit -q -m 'Initial add' | |
| 14 | $ mkdir empty |
|
17 | $ mkdir empty | |
| 15 | $ bzr add -q empty |
|
18 | $ bzr add -q empty | |
| 16 | $ bzr commit -q -m 'Empty directory added' |
|
19 | $ bzr commit -q -m 'Empty directory added' | |
| 17 | $ echo content > empty/something |
|
20 | $ echo content > empty/something | |
| 18 | $ bzr add -q empty/something |
|
21 | $ bzr add -q empty/something | |
| 19 | $ bzr commit -q -m 'Added file into directory' |
|
22 | $ bzr commit -q -m 'Added file into directory' | |
| 20 | $ cd .. |
|
23 | $ cd .. | |
| 21 | $ hg convert source source-hg |
|
24 | $ hg convert source source-hg | |
| 22 | initializing destination source-hg repository |
|
25 | initializing destination source-hg repository | |
| 23 | scanning source... |
|
26 | scanning source... | |
| 24 | sorting... |
|
27 | sorting... | |
| 25 | converting... |
|
28 | converting... | |
| 26 | 2 Initial add |
|
29 | 2 Initial add | |
| 27 | 1 Empty directory added |
|
30 | 1 Empty directory added | |
| 28 | 0 Added file into directory |
|
31 | 0 Added file into directory | |
| 29 | $ manifest source-hg 1 |
|
32 | $ manifest source-hg 1 | |
| 30 | % manifest of 1 |
|
33 | % manifest of 1 | |
| 31 | 644 a |
|
34 | 644 a | |
| 32 | $ manifest source-hg tip |
|
35 | $ manifest source-hg tip | |
| 33 | % manifest of tip |
|
36 | % manifest of tip | |
| 34 | 644 a |
|
37 | 644 a | |
| 35 | 644 empty/something |
|
38 | 644 empty/something | |
| 36 | $ cd .. |
|
39 | $ cd .. | |
| 37 |
|
40 | |||
| 38 | directory renames |
|
41 | directory renames | |
| 39 |
|
42 | |||
| 40 | $ mkdir test-dir-rename |
|
43 | $ mkdir test-dir-rename | |
| 41 | $ cd test-dir-rename |
|
44 | $ cd test-dir-rename | |
| 42 | $ bzr init -q source |
|
45 | $ bzr init -q source | |
| 43 | $ cd source |
|
46 | $ cd source | |
| 44 | $ mkdir tpyo |
|
47 | $ mkdir tpyo | |
| 45 | $ echo content > tpyo/something |
|
48 | $ echo content > tpyo/something | |
| 46 | $ bzr add -q tpyo |
|
49 | $ bzr add -q tpyo | |
| 47 | $ bzr commit -q -m 'Added directory' |
|
50 | $ bzr commit -q -m 'Added directory' | |
| 48 | $ bzr mv tpyo typo |
|
51 | $ bzr mv tpyo typo | |
| 49 | tpyo => typo |
|
52 | tpyo => typo | |
| 50 | $ bzr commit -q -m 'Oops, typo' |
|
53 | $ bzr commit -q -m 'Oops, typo' | |
| 51 | $ cd .. |
|
54 | $ cd .. | |
| 52 | $ hg convert source source-hg |
|
55 | $ hg convert source source-hg | |
| 53 | initializing destination source-hg repository |
|
56 | initializing destination source-hg repository | |
| 54 | scanning source... |
|
57 | scanning source... | |
| 55 | sorting... |
|
58 | sorting... | |
| 56 | converting... |
|
59 | converting... | |
| 57 | 1 Added directory |
|
60 | 1 Added directory | |
| 58 | 0 Oops, typo |
|
61 | 0 Oops, typo | |
| 59 | $ manifest source-hg 0 |
|
62 | $ manifest source-hg 0 | |
| 60 | % manifest of 0 |
|
63 | % manifest of 0 | |
| 61 | 644 tpyo/something |
|
64 | 644 tpyo/something | |
| 62 | $ manifest source-hg tip |
|
65 | $ manifest source-hg tip | |
| 63 | % manifest of tip |
|
66 | % manifest of tip | |
| 64 | 644 typo/something |
|
67 | 644 typo/something | |
| 65 | $ cd .. |
|
68 | $ cd .. | |
| 66 |
|
69 | |||
| 67 | nested directory renames |
|
70 | nested directory renames | |
| 68 |
|
71 | |||
| 69 | $ mkdir test-nested-dir-rename |
|
72 | $ mkdir test-nested-dir-rename | |
| 70 | $ cd test-nested-dir-rename |
|
73 | $ cd test-nested-dir-rename | |
| 71 | $ bzr init -q source |
|
74 | $ bzr init -q source | |
| 72 | $ cd source |
|
75 | $ cd source | |
| 73 | $ mkdir -p firstlevel/secondlevel/thirdlevel |
|
76 | $ mkdir -p firstlevel/secondlevel/thirdlevel | |
| 74 | $ echo content > firstlevel/secondlevel/file |
|
77 | $ echo content > firstlevel/secondlevel/file | |
| 75 | $ echo this_needs_to_be_there_too > firstlevel/secondlevel/thirdlevel/stuff |
|
78 | $ echo this_needs_to_be_there_too > firstlevel/secondlevel/thirdlevel/stuff | |
| 76 | $ bzr add -q firstlevel |
|
79 | $ bzr add -q firstlevel | |
| 77 | $ bzr commit -q -m 'Added nested directories' |
|
80 | $ bzr commit -q -m 'Added nested directories' | |
| 78 | $ bzr mv firstlevel/secondlevel secondlevel |
|
81 | $ bzr mv firstlevel/secondlevel secondlevel | |
| 79 | firstlevel/secondlevel => secondlevel |
|
82 | firstlevel/secondlevel => secondlevel | |
| 80 | $ bzr commit -q -m 'Moved secondlevel one level up' |
|
83 | $ bzr commit -q -m 'Moved secondlevel one level up' | |
| 81 | $ cd .. |
|
84 | $ cd .. | |
| 82 | $ hg convert source source-hg |
|
85 | $ hg convert source source-hg | |
| 83 | initializing destination source-hg repository |
|
86 | initializing destination source-hg repository | |
| 84 | scanning source... |
|
87 | scanning source... | |
| 85 | sorting... |
|
88 | sorting... | |
| 86 | converting... |
|
89 | converting... | |
| 87 | 1 Added nested directories |
|
90 | 1 Added nested directories | |
| 88 | 0 Moved secondlevel one level up |
|
91 | 0 Moved secondlevel one level up | |
| 89 | $ manifest source-hg tip |
|
92 | $ manifest source-hg tip | |
| 90 | % manifest of tip |
|
93 | % manifest of tip | |
| 91 | 644 secondlevel/file |
|
94 | 644 secondlevel/file | |
| 92 | 644 secondlevel/thirdlevel/stuff |
|
95 | 644 secondlevel/thirdlevel/stuff | |
| 93 | $ cd .. |
|
96 | $ cd .. | |
| 94 |
|
97 | |||
| 95 | directory remove |
|
98 | directory remove | |
| 96 |
|
99 | |||
| 97 | $ mkdir test-dir-remove |
|
100 | $ mkdir test-dir-remove | |
| 98 | $ cd test-dir-remove |
|
101 | $ cd test-dir-remove | |
| 99 | $ bzr init -q source |
|
102 | $ bzr init -q source | |
| 100 | $ cd source |
|
103 | $ cd source | |
| 101 | $ mkdir src |
|
104 | $ mkdir src | |
| 102 | $ echo content > src/sourcecode |
|
105 | $ echo content > src/sourcecode | |
| 103 | $ bzr add -q src |
|
106 | $ bzr add -q src | |
| 104 | $ bzr commit -q -m 'Added directory' |
|
107 | $ bzr commit -q -m 'Added directory' | |
| 105 | $ bzr rm -q src |
|
108 | $ bzr rm -q src | |
| 106 | $ bzr commit -q -m 'Removed directory' |
|
109 | $ bzr commit -q -m 'Removed directory' | |
| 107 | $ cd .. |
|
110 | $ cd .. | |
| 108 | $ hg convert source source-hg |
|
111 | $ hg convert source source-hg | |
| 109 | initializing destination source-hg repository |
|
112 | initializing destination source-hg repository | |
| 110 | scanning source... |
|
113 | scanning source... | |
| 111 | sorting... |
|
114 | sorting... | |
| 112 | converting... |
|
115 | converting... | |
| 113 | 1 Added directory |
|
116 | 1 Added directory | |
| 114 | 0 Removed directory |
|
117 | 0 Removed directory | |
| 115 | $ manifest source-hg 0 |
|
118 | $ manifest source-hg 0 | |
| 116 | % manifest of 0 |
|
119 | % manifest of 0 | |
| 117 | 644 src/sourcecode |
|
120 | 644 src/sourcecode | |
| 118 | $ manifest source-hg tip |
|
121 | $ manifest source-hg tip | |
| 119 | % manifest of tip |
|
122 | % manifest of tip | |
| 120 | $ cd .. |
|
123 | $ cd .. | |
| 121 |
|
124 | |||
| 122 | directory replace |
|
125 | directory replace | |
| 123 |
|
126 | |||
| 124 | $ mkdir test-dir-replace |
|
127 | $ mkdir test-dir-replace | |
| 125 | $ cd test-dir-replace |
|
128 | $ cd test-dir-replace | |
| 126 | $ bzr init -q source |
|
129 | $ bzr init -q source | |
| 127 | $ cd source |
|
130 | $ cd source | |
| 128 | $ mkdir first second |
|
131 | $ mkdir first second | |
| 129 | $ echo content > first/file |
|
132 | $ echo content > first/file | |
| 130 | $ echo morecontent > first/dummy |
|
133 | $ echo morecontent > first/dummy | |
| 131 | $ echo othercontent > second/something |
|
134 | $ echo othercontent > second/something | |
| 132 | $ bzr add -q first second |
|
135 | $ bzr add -q first second | |
| 133 | $ bzr commit -q -m 'Initial layout' |
|
136 | $ bzr commit -q -m 'Initial layout' | |
| 134 | $ bzr mv first/file second/file |
|
137 | $ bzr mv first/file second/file | |
| 135 | first/file => second/file |
|
138 | first/file => second/file | |
| 136 | $ bzr mv first third |
|
139 | $ bzr mv first third | |
| 137 | first => third |
|
140 | first => third | |
| 138 | $ bzr commit -q -m 'Some conflicting moves' |
|
141 | $ bzr commit -q -m 'Some conflicting moves' | |
| 139 | $ cd .. |
|
142 | $ cd .. | |
| 140 | $ hg convert source source-hg |
|
143 | $ hg convert source source-hg | |
| 141 | initializing destination source-hg repository |
|
144 | initializing destination source-hg repository | |
| 142 | scanning source... |
|
145 | scanning source... | |
| 143 | sorting... |
|
146 | sorting... | |
| 144 | converting... |
|
147 | converting... | |
| 145 | 1 Initial layout |
|
148 | 1 Initial layout | |
| 146 | 0 Some conflicting moves |
|
149 | 0 Some conflicting moves | |
| 147 | $ manifest source-hg tip |
|
150 | $ manifest source-hg tip | |
| 148 | % manifest of tip |
|
151 | % manifest of tip | |
| 149 | 644 second/file |
|
152 | 644 second/file | |
| 150 | 644 second/something |
|
153 | 644 second/something | |
| 151 | 644 third/dummy |
|
154 | 644 third/dummy | |
| 152 | $ cd .. |
|
155 | $ cd .. | |
| 153 |
|
156 | |||
| 154 | divergent nested renames (issue3089) |
|
157 | divergent nested renames (issue3089) | |
| 155 |
|
158 | |||
| 156 | $ mkdir test-divergent-renames |
|
159 | $ mkdir test-divergent-renames | |
| 157 | $ cd test-divergent-renames |
|
160 | $ cd test-divergent-renames | |
| 158 | $ bzr init -q source |
|
161 | $ bzr init -q source | |
| 159 | $ cd source |
|
162 | $ cd source | |
| 160 | $ mkdir -p a/c |
|
163 | $ mkdir -p a/c | |
| 161 | $ echo a > a/fa |
|
164 | $ echo a > a/fa | |
| 162 | $ echo c > a/c/fc |
|
165 | $ echo c > a/c/fc | |
| 163 | $ bzr add -q a |
|
166 | $ bzr add -q a | |
| 164 | $ bzr commit -q -m 'Initial layout' |
|
167 | $ bzr commit -q -m 'Initial layout' | |
| 165 | $ bzr mv a b |
|
168 | $ bzr mv a b | |
| 166 | a => b |
|
169 | a => b | |
| 167 | $ mkdir a |
|
170 | $ mkdir a | |
| 168 | $ bzr add a |
|
171 | $ bzr add a | |
| 169 | add(ed|ing) a (re) |
|
172 | add(ed|ing) a (re) | |
| 170 | $ bzr mv b/c a/c |
|
173 | $ bzr mv b/c a/c | |
| 171 | b/c => a/c |
|
174 | b/c => a/c | |
| 172 | $ bzr status |
|
175 | $ bzr status | |
| 173 | added: |
|
176 | added: | |
| 174 | a/ |
|
177 | a/ | |
| 175 | renamed: |
|
178 | renamed: | |
| 176 | a/? => b/? (re) |
|
179 | a/? => b/? (re) | |
| 177 | a/c/? => a/c/? (re) |
|
180 | a/c/? => a/c/? (re) | |
| 178 | $ bzr commit -q -m 'Divergent renames' |
|
181 | $ bzr commit -q -m 'Divergent renames' | |
| 179 | $ cd .. |
|
182 | $ cd .. | |
| 180 | $ hg convert source source-hg |
|
183 | $ hg convert source source-hg | |
| 181 | initializing destination source-hg repository |
|
184 | initializing destination source-hg repository | |
| 182 | scanning source... |
|
185 | scanning source... | |
| 183 | sorting... |
|
186 | sorting... | |
| 184 | converting... |
|
187 | converting... | |
| 185 | 1 Initial layout |
|
188 | 1 Initial layout | |
| 186 | 0 Divergent renames |
|
189 | 0 Divergent renames | |
| 187 | $ hg -R source-hg st -C --change 1 |
|
190 | $ hg -R source-hg st -C --change 1 | |
| 188 | A b/fa |
|
191 | A b/fa | |
| 189 | a/fa |
|
192 | a/fa | |
| 190 | R a/fa |
|
193 | R a/fa | |
| 191 | $ hg -R source-hg manifest -r 1 |
|
194 | $ hg -R source-hg manifest -r 1 | |
| 192 | a/c/fc |
|
195 | a/c/fc | |
| 193 | b/fa |
|
196 | b/fa | |
| 194 | $ cd .. |
|
197 | $ cd .. | |
General Comments 0
You need to be logged in to leave comments.
Login now