| author | Yuya Nishihara <yuya@tcha.org> |
| Sat, 07 Jul 2018 22:40:39 +0900 | |
| changeset 39111 | 46da52f4b820 |
| parent 38573 | 050fbd9d103a |
| child 39222 | 7a88643bc0ef |
| permissions | -rw-r--r-- |
|
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 .. |
|
38572
85da230c316a
convert: add a config knob for not saving the bzr revision
Matt Harbison <matt_harbison@yahoo.com>
parents:
38571
diff
changeset
|
42 |
$ 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
|
43 |
initializing destination source-hg repository |
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
44 |
scanning source... |
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
45 |
sorting... |
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
46 |
converting... |
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
47 |
4 Initial add |
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
48 |
3 Added branch1 file |
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
49 |
2 Added parent file |
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
50 |
1 Added brach2 file |
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
51 |
0 Merged branches |
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
52 |
$ glog -R source-hg |
|
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
12516
diff
changeset
|
53 |
o 5@source "(octopus merge fixup)" files: |
|
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 4@source "Merged branches" 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---+ 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
|
58 |
/ / |
|
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
12516
diff
changeset
|
59 |
| 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
|
60 |
| | |
|
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
12516
diff
changeset
|
61 |
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
|
62 |
|/ |
|
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
12516
diff
changeset
|
63 |
o 0@source "Initial add" files: file |
|
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
64 |
|
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
65 |
$ manifest source-hg tip |
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
66 |
% manifest of tip |
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
67 |
644 file |
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
68 |
644 file-branch1 |
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
69 |
644 file-branch2 |
|
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
70 |
644 file-parent |
|
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16060
diff
changeset
|
71 |
|
|
38573
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
72 |
$ 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
|
73 |
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
|
74 |
scanning source... |
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
75 |
sorting... |
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
76 |
converting... |
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
77 |
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
|
78 |
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
|
79 |
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
|
80 |
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
|
81 |
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
|
82 |
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
|
83 |
$ 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
|
84 |
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
|
85 |
searching for changes |
|
39111
46da52f4b820
commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents:
38573
diff
changeset
|
86 |
no changes found |
|
46da52f4b820
commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents:
38573
diff
changeset
|
87 |
[1] |
|
38573
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
88 |
|
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
89 |
$ 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
|
90 |
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
|
91 |
branch: source |
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
92 |
tag: tip |
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
93 |
phase: draft |
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
94 |
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
|
95 |
parent: 3:4aaba1bfb426b8941bbf63f9dd52301152695164 |
|
39111
46da52f4b820
commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents:
38573
diff
changeset
|
96 |
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
|
97 |
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
|
98 |
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
|
99 |
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
|
100 |
description: |
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
101 |
(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
|
102 |
|
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
103 |
|
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
104 |
$ 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
|
105 |
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
|
106 |
branch: source |
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
107 |
tag: tip |
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
108 |
phase: draft |
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
109 |
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
|
110 |
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
|
111 |
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
|
112 |
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
|
113 |
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
|
114 |
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
|
115 |
description: |
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
116 |
(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
|
117 |
|
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
118 |
|
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
119 |
$ 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
|
120 |
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
|
121 |
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
|
122 |
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
|
123 |
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
|
124 |
$ 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
|
125 |
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
|
126 |
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
|
127 |
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
|
128 |
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
|
129 |
|
|
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
130 |
$ 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
|
131 |
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
|
132 |
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
|
133 |
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
|
134 |
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
|
135 |
$ 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
|
136 |
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
|
137 |
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
|
138 |
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
|
139 |
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
|
140 |
|
|
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16060
diff
changeset
|
141 |
$ cd .. |