Mercurial > hg-stable
annotate tests/test-convert-bzr-merges.t @ 50179:9e1debbb477e
status: simplify the post status fixup phases
With the wlock automatically discarding changes when applicable, we can
simplify the code a bit.
* we perform the fixup operation before trying to grab the lock to narrow the `try/except`
* we no longer need to explicitly complare dirstate identities. We can trust
the dirstate internal refresh for that. It would invalidate dirty data when
needed.
* detect still data invalidation by checking the dirty flag before and after
taking the lock. Doing this is actually only necessary to issue the debug
message, we could blindy trust the dirstate internal to ignore the `write`
call on a non-dirty dirstate.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 21 Feb 2023 16:20:11 +0100 |
parents | 26127236b229 |
children |
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 |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
13 $ brz init -q source |
12516
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 |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
16 $ echo text > rename_me |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
17 $ brz add -q file rename_me |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
18 $ brz 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
|
19 $ cd .. |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
20 $ brz branch -q source source-branch1 |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
21 $ cd source-branch1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
22 $ echo morecontent >> file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
23 $ echo evenmorecontent > file-branch1 |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
24 $ brz add -q file-branch1 |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
25 $ brz 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
|
26 $ cd ../source |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
27 $ sleep 1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
28 $ echo content > file-parent |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
29 $ brz add -q file-parent |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
30 $ brz 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
|
31 $ cd .. |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
32 $ brz branch -q source source-branch2 |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
33 $ cd source-branch2 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
34 $ echo somecontent > file-branch2 |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
35 $ brz add -q file-branch2 |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
36 $ brz mv -q rename_me renamed |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
37 $ echo change > renamed |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
38 $ brz 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
|
39 $ sleep 1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
40 $ cd ../source |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
41 $ brz merge -q ../source-branch1 |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
42 $ brz merge -q --force ../source-branch2 |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
42424
diff
changeset
|
43 $ brz 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
|
44 $ cd .. |
39250
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
39148
diff
changeset
|
45 |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
46 BUG: file-branch2 should not be added in rev 4, and the rename_me -> renamed |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
47 move should be recorded in the fixup merge. |
38573
85da230c316a
convert: add a config knob for not saving the bzr revision
Matt Harbison <matt_harbison@yahoo.com>
parents:
38572
diff
changeset
|
48 $ 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
|
49 initializing destination source-hg repository |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
50 scanning source... |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
51 sorting... |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
52 converting... |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
53 4 Initial add |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
54 3 Added branch1 file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
55 2 Added parent file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
56 1 Added brach2 file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
57 0 Merged branches |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
58 warning: can't find ancestor for 'renamed' copied from 'rename_me'! |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
59 $ glog -R source-hg |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
60 o 5@source "(octopus merge fixup)" files+: [], files-: [], files: [renamed] |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
61 |\ |
42424
0c72eddb4be5
templatekw: make {file_*} compare to both merge parents (issue4292)
Martin von Zweigbergk <martinvonz@google.com>
parents:
39252
diff
changeset
|
62 | o 4@source "Merged branches" files+: [file-branch2 renamed], files-: [rename_me], files: [] |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
63 | |\ |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
64 o---+ 3@source-branch2 "Added brach2 file" files+: [file-branch2 renamed], files-: [rename_me], files: [] |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
65 / / |
39250
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
39148
diff
changeset
|
66 | 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
|
67 | | |
39250
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
39148
diff
changeset
|
68 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
|
69 |/ |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
70 o 0@source "Initial add" files+: [file rename_me], files-: [], files: [] |
12516
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
71 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
72 $ manifest source-hg tip |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
73 % manifest of tip |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
74 644 file |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
75 644 file-branch1 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
76 644 file-branch2 |
90efbd1a2a56
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com>
parents:
8084
diff
changeset
|
77 644 file-parent |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
78 644 renamed |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16060
diff
changeset
|
79 |
38574
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
80 $ hg convert source-hg hg2hg |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
81 initializing destination hg2hg repository |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
82 scanning source... |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
83 sorting... |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
84 converting... |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
85 5 Initial add |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
86 4 Added branch1 file |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
87 3 Added parent file |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
88 2 Added brach2 file |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
89 1 Merged branches |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
90 0 (octopus merge fixup) |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
91 |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
92 BUG: The manifest entries should be the same for matching revisions, and |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
93 nothing should be outgoing |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
94 |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
95 $ hg -R source-hg manifest --debug -r tip | grep renamed |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
96 67109fdebf6c556eb0a9d5696dd98c8420520405 644 renamed |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
97 $ hg -R hg2hg manifest --debug -r tip | grep renamed |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
98 27c968376d7c3afd095ecb9c7697919b933448c8 644 renamed |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
99 $ hg -R source-hg manifest --debug -r 'tip^' | grep renamed |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
100 27c968376d7c3afd095ecb9c7697919b933448c8 644 renamed |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
101 $ hg -R hg2hg manifest --debug -r 'tip^' | grep renamed |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
102 27c968376d7c3afd095ecb9c7697919b933448c8 644 renamed |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
103 |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
104 BUG: The revisions found should be the same in both repos |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
105 |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
106 $ hg --cwd source-hg log -r 'file("renamed")' -G -Tcompact |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
107 o 5[tip]:4,3 6652429c300a 2009-10-10 08:00 +0100 foo |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
108 |\ (octopus merge fixup) |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
109 | | |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
110 | o 4:2,1 e0ae8af3503a 2009-10-10 08:00 +0100 foo |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
111 | |\ Merged branches |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
112 | ~ ~ |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
113 o 3 138bed2e14be 2009-10-10 08:00 +0100 foo |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
114 | Added brach2 file |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
115 ~ |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
116 $ hg --cwd hg2hg log -r 'file("renamed")' -G -Tcompact |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
117 o 4:2,1 e0ae8af3503a 2009-10-10 08:00 +0100 foo |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
118 |\ Merged branches |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
119 ~ ~ |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
120 o 3 138bed2e14be 2009-10-10 08:00 +0100 foo |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
121 | Added brach2 file |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
122 ~ |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
123 |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
124 BUG(?): The move seems to be recorded in rev 4, so it should probably show up |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
125 there. It's not recorded as a move in rev 5, even in source-hg. |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
126 |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
127 $ hg -R source-hg up -q tip |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
128 $ hg -R hg2hg up -q tip |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
129 $ hg --cwd source-hg log -r 'follow("renamed")' -G -Tcompact |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
130 @ 5[tip]:4,3 6652429c300a 2009-10-10 08:00 +0100 foo |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
131 |\ (octopus merge fixup) |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
132 | : |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
133 o : 3 138bed2e14be 2009-10-10 08:00 +0100 foo |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
134 :/ Added brach2 file |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
135 : |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
136 o 0 18b86f5df51b 2009-10-10 08:00 +0100 foo |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
137 Initial add |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
138 |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
139 $ hg --cwd hg2hg log -r 'follow("renamed")' -G -Tcompact |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
140 o 3 138bed2e14be 2009-10-10 08:00 +0100 foo |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
141 : Added brach2 file |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
142 : |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
143 o 0 18b86f5df51b 2009-10-10 08:00 +0100 foo |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
144 Initial add |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
145 |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
146 |
38574
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
147 $ 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:
38573
diff
changeset
|
148 comparing with source-hg |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
149 searching for changes |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
150 5[tip]:4,3 3be2299ccd31 2009-10-10 08:00 +0100 foo |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
151 (octopus merge fixup) |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
152 |
38574
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
153 |
39251
6c72e1248856
tests: add a test to show the added/modified/removed files in a bzr convert
Matt Harbison <matt_harbison@yahoo.com>
parents:
39250
diff
changeset
|
154 $ glog -R hg2hg |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
155 @ 5@source "(octopus merge fixup)" files+: [], files-: [], files: [] |
39251
6c72e1248856
tests: add a test to show the added/modified/removed files in a bzr convert
Matt Harbison <matt_harbison@yahoo.com>
parents:
39250
diff
changeset
|
156 |\ |
42424
0c72eddb4be5
templatekw: make {file_*} compare to both merge parents (issue4292)
Martin von Zweigbergk <martinvonz@google.com>
parents:
39252
diff
changeset
|
157 | o 4@source "Merged branches" files+: [file-branch2 renamed], files-: [rename_me], files: [] |
39251
6c72e1248856
tests: add a test to show the added/modified/removed files in a bzr convert
Matt Harbison <matt_harbison@yahoo.com>
parents:
39250
diff
changeset
|
158 | |\ |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
159 o---+ 3@source-branch2 "Added brach2 file" files+: [file-branch2 renamed], files-: [rename_me], files: [] |
39251
6c72e1248856
tests: add a test to show the added/modified/removed files in a bzr convert
Matt Harbison <matt_harbison@yahoo.com>
parents:
39250
diff
changeset
|
160 / / |
6c72e1248856
tests: add a test to show the added/modified/removed files in a bzr convert
Matt Harbison <matt_harbison@yahoo.com>
parents:
39250
diff
changeset
|
161 | o 2@source "Added parent file" files+: [file-parent], files-: [], files: [] |
6c72e1248856
tests: add a test to show the added/modified/removed files in a bzr convert
Matt Harbison <matt_harbison@yahoo.com>
parents:
39250
diff
changeset
|
162 | | |
6c72e1248856
tests: add a test to show the added/modified/removed files in a bzr convert
Matt Harbison <matt_harbison@yahoo.com>
parents:
39250
diff
changeset
|
163 o | 1@source-branch1 "Added branch1 file" files+: [file-branch1], files-: [], files: [file] |
6c72e1248856
tests: add a test to show the added/modified/removed files in a bzr convert
Matt Harbison <matt_harbison@yahoo.com>
parents:
39250
diff
changeset
|
164 |/ |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
165 o 0@source "Initial add" files+: [file rename_me], files-: [], files: [] |
39251
6c72e1248856
tests: add a test to show the added/modified/removed files in a bzr convert
Matt Harbison <matt_harbison@yahoo.com>
parents:
39250
diff
changeset
|
166 |
6c72e1248856
tests: add a test to show the added/modified/removed files in a bzr convert
Matt Harbison <matt_harbison@yahoo.com>
parents:
39250
diff
changeset
|
167 |
38574
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
168 $ hg -R source-hg log --debug -r tip |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
169 changeset: 5:6652429c300ab66fdeaf2e730945676a00b53231 |
38574
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
170 branch: source |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
171 tag: tip |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
172 phase: draft |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
173 parent: 4:e0ae8af3503af9bbffb0b29268a02744cc61a561 |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
174 parent: 3:138bed2e14be415a2692b02e41405b2864f758b4 |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
175 manifest: 5:1eabd5f5d4b985784cf2c45c717ff053eca14b0d |
38574
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
176 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:
38573
diff
changeset
|
177 date: Sat Oct 10 08:00:04 2009 +0100 |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
178 files: renamed |
38574
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
179 extra: branch=source |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
180 description: |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
181 (octopus merge fixup) |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
182 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
183 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
184 $ hg -R hg2hg log --debug -r tip |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
185 changeset: 5:3be2299ccd315ff9aab2b49bdb0d14e3244435e8 |
38574
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
186 branch: source |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
187 tag: tip |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
188 phase: draft |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
189 parent: 4:e0ae8af3503af9bbffb0b29268a02744cc61a561 |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
190 parent: 3:138bed2e14be415a2692b02e41405b2864f758b4 |
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
191 manifest: 4:3ece3c7f2cc6df15b3cbbf3273c69869fc7c3ab0 |
38574
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
192 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:
38573
diff
changeset
|
193 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:
38573
diff
changeset
|
194 extra: branch=source |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
195 description: |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
196 (octopus merge fixup) |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
197 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
198 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
199 $ 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:
38573
diff
changeset
|
200 cdf31ed9242b209cd94697112160e2c5b37a667d 644 file |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
201 5108144f585149b29779d7c7e51d61dd22303ffe 644 file-branch1 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
202 80753c4a9ac3806858405b96b24a907b309e3616 644 file-branch2 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
203 7108421418404a937c684d2479a34a24d2ce4757 644 file-parent |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
204 67109fdebf6c556eb0a9d5696dd98c8420520405 644 renamed |
38574
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
205 $ 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:
38573
diff
changeset
|
206 cdf31ed9242b209cd94697112160e2c5b37a667d 644 file |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
207 5108144f585149b29779d7c7e51d61dd22303ffe 644 file-branch1 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
208 80753c4a9ac3806858405b96b24a907b309e3616 644 file-branch2 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
209 7108421418404a937c684d2479a34a24d2ce4757 644 file-parent |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
210 27c968376d7c3afd095ecb9c7697919b933448c8 644 renamed |
38574
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
211 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
212 $ 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:
38573
diff
changeset
|
213 cdf31ed9242b209cd94697112160e2c5b37a667d 644 file |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
214 5108144f585149b29779d7c7e51d61dd22303ffe 644 file-branch1 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
215 80753c4a9ac3806858405b96b24a907b309e3616 644 file-branch2 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
216 7108421418404a937c684d2479a34a24d2ce4757 644 file-parent |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
217 27c968376d7c3afd095ecb9c7697919b933448c8 644 renamed |
38574
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
218 $ 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:
38573
diff
changeset
|
219 cdf31ed9242b209cd94697112160e2c5b37a667d 644 file |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
220 5108144f585149b29779d7c7e51d61dd22303ffe 644 file-branch1 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
221 80753c4a9ac3806858405b96b24a907b309e3616 644 file-branch2 |
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
222 7108421418404a937c684d2479a34a24d2ce4757 644 file-parent |
39252
5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
Matt Harbison <matt_harbison@yahoo.com>
parents:
39251
diff
changeset
|
223 27c968376d7c3afd095ecb9c7697919b933448c8 644 renamed |
38574
050fbd9d103a
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
Matt Harbison <matt_harbison@yahoo.com>
parents:
38573
diff
changeset
|
224 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16060
diff
changeset
|
225 $ cd .. |