Mercurial > hg
annotate tests/test-convert-bzr-merges.t @ 39222:7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
There's a bug related to incorrect status values that can be triggered by an
octopus fixup merge. Seeing what the current status is (instead of just the
aggregate list) will hopefully help track this down.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 13 Jul 2018 12:33:06 -0400 |
parents | 46da52f4b820 |
children | 6c72e1248856 |
rev | line source |
---|---|
26066
89872688893f
tests: move '#require bzr' into .t files
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
1 #require bzr |
89872688893f
tests: move '#require bzr' into .t files
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16913
diff
changeset
|
2 |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
3 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
|
4 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
|
5 should fix it. |
7053 | 6 |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
7 $ . "$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
|
8 |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
9 test multiple merges at once |
7053 | 10 |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
11 $ mkdir test-multimerge |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
12 $ cd test-multimerge |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
13 $ bzr init -q source |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
14 $ cd source |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
15 $ echo content > file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
16 $ bzr add -q file |
38571
30a027c0e327
test-bzr: use a fixed commit time
Matt Harbison <matt_harbison@yahoo.com>
parents:
26066
diff
changeset
|
17 $ bzr commit -q -m 'Initial add' '--commit-time=2009-10-10 08:00:00 +0100' |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
18 $ cd .. |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
19 $ bzr branch -q source source-branch1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
20 $ cd source-branch1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
21 $ echo morecontent >> file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
22 $ echo evenmorecontent > file-branch1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
23 $ bzr add -q file-branch1 |
38571
30a027c0e327
test-bzr: use a fixed commit time
Matt Harbison <matt_harbison@yahoo.com>
parents:
26066
diff
changeset
|
24 $ bzr commit -q -m 'Added branch1 file' '--commit-time=2009-10-10 08:00:01 +0100' |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
25 $ cd ../source |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
26 $ sleep 1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
27 $ echo content > file-parent |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
28 $ bzr add -q file-parent |
38571
30a027c0e327
test-bzr: use a fixed commit time
Matt Harbison <matt_harbison@yahoo.com>
parents:
26066
diff
changeset
|
29 $ bzr commit -q -m 'Added parent file' '--commit-time=2009-10-10 08:00:02 +0100' |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
30 $ cd .. |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
31 $ bzr branch -q source source-branch2 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
32 $ cd source-branch2 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
33 $ echo somecontent > file-branch2 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
34 $ bzr add -q file-branch2 |
38571
30a027c0e327
test-bzr: use a fixed commit time
Matt Harbison <matt_harbison@yahoo.com>
parents:
26066
diff
changeset
|
35 $ bzr commit -q -m 'Added brach2 file' '--commit-time=2009-10-10 08:00:03 +0100' |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
36 $ sleep 1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
37 $ cd ../source |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
38 $ bzr merge -q ../source-branch1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
39 $ bzr merge -q --force ../source-branch2 |
38571
30a027c0e327
test-bzr: use a fixed commit time
Matt Harbison <matt_harbison@yahoo.com>
parents:
26066
diff
changeset
|
40 $ bzr commit -q -m 'Merged branches' '--commit-time=2009-10-10 08:00:04 +0100' |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
41 $ cd .. |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
39111
diff
changeset
|
42 |
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
39111
diff
changeset
|
43 BUG: file-branch2 should not be added in rev 4 |
38572
85da230c316a
convert: add a config knob for not saving the bzr revision
Matt Harbison <matt_harbison@yahoo.com>
parents:
38571
diff
changeset
|
44 $ hg convert --datesort --config convert.bzr.saverev=False source source-hg |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
45 initializing destination source-hg repository |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
46 scanning source... |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
47 sorting... |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
48 converting... |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
49 4 Initial add |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
50 3 Added branch1 file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
51 2 Added parent file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
52 1 Added brach2 file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
53 0 Merged branches |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
54 $ glog -R source-hg |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
39111
diff
changeset
|
55 o 5@source "(octopus merge fixup)" files+: [], files-: [], files: [] |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
56 |\ |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
39111
diff
changeset
|
57 | o 4@source "Merged branches" files+: [file-branch1 file-branch2], files-: [], files: [file] |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
58 | |\ |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
39111
diff
changeset
|
59 o---+ 3@source-branch2 "Added brach2 file" files+: [file-branch2], files-: [], files: [] |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
60 / / |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
39111
diff
changeset
|
61 | o 2@source "Added parent file" files+: [file-parent], files-: [], files: [] |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
62 | | |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
39111
diff
changeset
|
63 o | 1@source-branch1 "Added branch1 file" files+: [file-branch1], files-: [], files: [file] |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
64 |/ |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
39111
diff
changeset
|
65 o 0@source "Initial add" files+: [file], files-: [], files: [] |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
66 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
67 $ manifest source-hg tip |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
68 % manifest of tip |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
69 644 file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
70 644 file-branch1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
71 644 file-branch2 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
72 644 file-parent |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16060
diff
changeset
|
73 |
38573
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
74 $ hg convert source-hg hg2hg |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
75 initializing destination hg2hg repository |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
76 scanning source... |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
77 sorting... |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
78 converting... |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
79 5 Initial add |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
80 4 Added branch1 file |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
81 3 Added parent file |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
82 2 Added brach2 file |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
83 1 Merged branches |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
84 0 (octopus merge fixup) |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
85 $ hg -R hg2hg out source-hg -T compact |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
86 comparing with source-hg |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
87 searching for changes |
39111
46da52f4b820
commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents:
38573
diff
changeset
|
88 no changes found |
46da52f4b820
commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents:
38573
diff
changeset
|
89 [1] |
38573
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
90 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
91 $ hg -R source-hg log --debug -r tip |
39111
46da52f4b820
commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents:
38573
diff
changeset
|
92 changeset: 5:6bd55e8269392769783345686faf7ff7b3b0215d |
38573
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
93 branch: source |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
94 tag: tip |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
95 phase: draft |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
96 parent: 4:1dc38c377bb35eeea4fa955056fbe4440d54a743 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
97 parent: 3:4aaba1bfb426b8941bbf63f9dd52301152695164 |
39111
46da52f4b820
commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents:
38573
diff
changeset
|
98 manifest: 4:daa315d56a98ba20811fdd0d9d575861f65cfa8c |
38573
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
99 user: Foo Bar <foo.bar@example.com> |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
100 date: Sat Oct 10 08:00:04 2009 +0100 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
101 extra: branch=source |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
102 description: |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
103 (octopus merge fixup) |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
104 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
105 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
106 $ hg -R hg2hg log --debug -r tip |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
107 changeset: 5:6bd55e8269392769783345686faf7ff7b3b0215d |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
108 branch: source |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
109 tag: tip |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
110 phase: draft |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
111 parent: 4:1dc38c377bb35eeea4fa955056fbe4440d54a743 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
112 parent: 3:4aaba1bfb426b8941bbf63f9dd52301152695164 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
113 manifest: 4:daa315d56a98ba20811fdd0d9d575861f65cfa8c |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
114 user: Foo Bar <foo.bar@example.com> |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
115 date: Sat Oct 10 08:00:04 2009 +0100 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
116 extra: branch=source |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
117 description: |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
118 (octopus merge fixup) |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
119 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
120 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
121 $ hg -R source-hg manifest --debug -r tip |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
122 cdf31ed9242b209cd94697112160e2c5b37a667d 644 file |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
123 5108144f585149b29779d7c7e51d61dd22303ffe 644 file-branch1 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
124 80753c4a9ac3806858405b96b24a907b309e3616 644 file-branch2 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
125 7108421418404a937c684d2479a34a24d2ce4757 644 file-parent |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
126 $ hg -R source-hg manifest --debug -r 'tip^' |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
127 cdf31ed9242b209cd94697112160e2c5b37a667d 644 file |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
128 5108144f585149b29779d7c7e51d61dd22303ffe 644 file-branch1 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
129 80753c4a9ac3806858405b96b24a907b309e3616 644 file-branch2 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
130 7108421418404a937c684d2479a34a24d2ce4757 644 file-parent |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
131 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
132 $ hg -R hg2hg manifest --debug -r tip |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
133 cdf31ed9242b209cd94697112160e2c5b37a667d 644 file |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
134 5108144f585149b29779d7c7e51d61dd22303ffe 644 file-branch1 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
135 80753c4a9ac3806858405b96b24a907b309e3616 644 file-branch2 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
136 7108421418404a937c684d2479a34a24d2ce4757 644 file-parent |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
137 $ hg -R hg2hg manifest --debug -r 'tip^' |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
138 cdf31ed9242b209cd94697112160e2c5b37a667d 644 file |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
139 5108144f585149b29779d7c7e51d61dd22303ffe 644 file-branch1 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
140 80753c4a9ac3806858405b96b24a907b309e3616 644 file-branch2 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
141 7108421418404a937c684d2479a34a24d2ce4757 644 file-parent |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
142 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16060
diff
changeset
|
143 $ cd .. |