Mercurial > hg
annotate tests/test-convert-bzr-merges.out @ 7429:dbc40381620e
tests: Skip tests if they will fail because of outer repo
For different reasons these tests will fail if run in a tmpdir which is in a hg
repo.
The following three tests assumes no .hg in path dirs - I don't know how to
work around that:
* test-dispatch explicitly tests for no repo and expects "abort: There is no
Mercurial repository here (.hg not found)!"
* test-extension expects parentui to be None when not cd'ed to a repo dir
* test-globalopts tests that implicit -R works correctly - that could perhaps be
done from another repo instead of assuming no repo
The following two might be worth investigating further:
* test-convert-svn-sink fails for unknown reasons, starting with "abort:
unresolved merge conflicts (see hg resolve)"
* test-glog gets strange failures when testing "from outer space"
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 27 Nov 2008 00:57:31 +0100 |
parents | 209ef5f3534c |
children |
rev | line source |
---|---|
7053 | 1 % test multiple merges at once |
2 initializing destination source-hg repository | |
3 scanning source... | |
4 sorting... | |
5 converting... | |
6 4 Initial add | |
7 3 Added branch1 file | |
8 2 Added parent file | |
9 1 Added brach2 file | |
10 0 Merged branches | |
11 o 5 "(octopus merge fixup)" files: | |
12 |\ | |
13 | o 4 "Merged branches" files: file-branch2 | |
14 | |\ | |
15 o---+ 3 "Added brach2 file" files: file-branch2 | |
16 / / | |
17 | o 2 "Added parent file" files: file-parent | |
18 | | | |
19 o | 1 "Added branch1 file" files: file file-branch1 | |
20 |/ | |
21 o 0 "Initial add" files: file | |
22 | |
23 % manifest of tip | |
24 644 file | |
25 644 file-branch1 | |
26 644 file-branch2 | |
27 644 file-parent |