Show More
@@ -170,6 +170,21 b" echo '% parent should be 0 (fetch did no" | |||
|
170 | 170 | hg -R n2 parents --template '{rev}\n' |
|
171 | 171 | rm -fr n1 n2 |
|
172 | 172 | |
|
173 | echo % test fetch with inactive branches | |
|
174 | hg init ib1 | |
|
175 | echo a > ib1/a | |
|
176 | hg --cwd ib1 ci -Am base | |
|
177 | hg --cwd ib1 branch second | |
|
178 | echo b > ib1/b | |
|
179 | hg --cwd ib1 ci -Am onsecond | |
|
180 | hg --cwd ib1 branch -f default | |
|
181 | echo c > ib1/c | |
|
182 | hg --cwd ib1 ci -Am newdefault | |
|
183 | hg clone ib1 ib2 | |
|
184 | echo % fetch should succeed | |
|
185 | hg --cwd ib2 fetch ../ib1 | |
|
186 | rm -fr ib1 ib2 | |
|
187 | ||
|
173 | 188 | "$TESTDIR/killdaemons.py" |
|
174 | 189 | |
|
175 | 190 | true |
@@ -178,3 +178,15 b' marked working directory as branch topic' | |||
|
178 | 178 | abort: working dir not at branch tip (use "hg update" to check out branch tip) |
|
179 | 179 | % parent should be 0 (fetch did not update or merge anything) |
|
180 | 180 | 0 |
|
181 | % test fetch with inactive branches | |
|
182 | adding a | |
|
183 | marked working directory as branch second | |
|
184 | adding b | |
|
185 | marked working directory as branch default | |
|
186 | adding c | |
|
187 | updating working directory | |
|
188 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
189 | % fetch should succeed | |
|
190 | pulling from ../ib1 | |
|
191 | searching for changes | |
|
192 | no changes found |
General Comments 0
You need to be logged in to leave comments.
Login now