Mercurial > hg
annotate tests/test-convert-bzr-merges.t @ 24213:e0c1328df872
workingctx: use normal dirs() instead of dirstate.dirs()
The workingctx class was using dirstate.dirs() as it's implementation. The
sparse extension maintains a pruned down version of the dirstate, so this
resulted in the workingctx reporting an incorrect listing of directories
during merge calculations (it was detecting directory renames when it
shouldn't have).
The fix is to use the default implementation, which uses workingctx._manifest,
which unions the manifest with the dirstate to produce the correct overall
picture. This also produces more accurate output since it will no longer
return directories that have been entirely deleted in the dirstate.
Tests will be added to the sparse extension to detect regressions for this.
author | Durham Goode <durham@fb.com> |
---|---|
date | Thu, 05 Mar 2015 22:16:28 -0800 |
parents | f2719b387380 |
children | 89872688893f |
rev | line source |
---|---|
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
1 N.B. bzr 1.13 has a bug that breaks this test. If you see this |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
2 test fail, check your bzr version. Upgrading to bzr 1.13.1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
3 should fix it. |
7053 | 4 |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
5 $ . "$TESTDIR/bzr-definitions" |
8084
5b3fee9c1f4d
Add comment about this test failing under bzr 1.13 due to a bug in bzr.
Greg Ward <greg-hg@gerg.ca>
parents:
7604
diff
changeset
|
6 |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
7 test multiple merges at once |
7053 | 8 |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
9 $ mkdir test-multimerge |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
10 $ cd test-multimerge |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
11 $ bzr init -q source |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
12 $ cd source |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
13 $ echo content > file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
14 $ bzr add -q file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
15 $ bzr commit -q -m 'Initial add' |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
16 $ cd .. |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
17 $ bzr branch -q source source-branch1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
18 $ cd source-branch1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
19 $ echo morecontent >> file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
20 $ echo evenmorecontent > file-branch1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
21 $ bzr add -q file-branch1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
22 $ bzr commit -q -m 'Added branch1 file' |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
23 $ cd ../source |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
24 $ sleep 1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
25 $ echo content > file-parent |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
26 $ bzr add -q file-parent |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
27 $ bzr commit -q -m 'Added parent file' |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
28 $ cd .. |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
29 $ bzr branch -q source source-branch2 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
30 $ cd source-branch2 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
31 $ echo somecontent > file-branch2 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
32 $ bzr add -q file-branch2 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
33 $ bzr commit -q -m 'Added brach2 file' |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
34 $ sleep 1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
35 $ cd ../source |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
36 $ bzr merge -q ../source-branch1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
37 $ bzr merge -q --force ../source-branch2 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
38 $ bzr commit -q -m 'Merged branches' |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
39 $ cd .. |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
40 $ hg convert --datesort source source-hg |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
41 initializing destination source-hg repository |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
42 scanning source... |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
43 sorting... |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
44 converting... |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
45 4 Initial add |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
46 3 Added branch1 file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
47 2 Added parent file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
48 1 Added brach2 file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
49 0 Merged branches |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
50 $ glog -R source-hg |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
12516
diff
changeset
|
51 o 5@source "(octopus merge fixup)" files: |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
52 |\ |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
12516
diff
changeset
|
53 | o 4@source "Merged branches" files: file-branch2 |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
54 | |\ |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
12516
diff
changeset
|
55 o---+ 3@source-branch2 "Added brach2 file" files: file-branch2 |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
56 / / |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
12516
diff
changeset
|
57 | o 2@source "Added parent file" files: file-parent |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
58 | | |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
12516
diff
changeset
|
59 o | 1@source-branch1 "Added branch1 file" files: file file-branch1 |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
60 |/ |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
12516
diff
changeset
|
61 o 0@source "Initial add" files: file |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
62 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
63 $ manifest source-hg tip |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
64 % manifest of tip |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
65 644 file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
66 644 file-branch1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
67 644 file-branch2 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
68 644 file-parent |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16060
diff
changeset
|
69 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16060
diff
changeset
|
70 $ cd .. |