annotate tests/test-convert-bzr-directories.t @ 40892:140d455ef40a

test: enable sparse-revlog for test-hgweb-commands.t We are about to enable sparse-revlog globally. To help with reviewing the tests change, we isolate them in individual changesets. Differential Revision: https://phab.mercurial-scm.org/D5319
author Boris Feld <boris.feld@octobus.net>
date Mon, 12 Nov 2018 01:04:59 +0100
parents 89872688893f
children 815e9ca1078c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26066
89872688893f tests: move '#require bzr' into .t files
Gregory Szorc <gregory.szorc@gmail.com>
parents: 15487
diff changeset
1 #require bzr
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
2
12514
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
3 $ . "$TESTDIR/bzr-definitions"
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
4
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
5 empty directory
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
6
12514
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
7 $ mkdir test-empty
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
8 $ cd test-empty
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
9 $ bzr init -q source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
10 $ cd source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
11 $ echo content > a
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
12 $ bzr add -q a
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
13 $ bzr commit -q -m 'Initial add'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
14 $ mkdir empty
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
15 $ bzr add -q empty
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
16 $ bzr commit -q -m 'Empty directory added'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
17 $ echo content > empty/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
18 $ bzr add -q empty/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
19 $ bzr commit -q -m 'Added file into directory'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
20 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
21 $ hg convert source source-hg
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
22 initializing destination source-hg repository
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
23 scanning source...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
24 sorting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
25 converting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
26 2 Initial add
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
27 1 Empty directory added
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
28 0 Added file into directory
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
29 $ manifest source-hg 1
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
30 % manifest of 1
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
31 644 a
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
32 $ manifest source-hg tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
33 % manifest of tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
34 644 a
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
35 644 empty/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
36 $ cd ..
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
37
12514
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
38 directory renames
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
39
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
40 $ mkdir test-dir-rename
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
41 $ cd test-dir-rename
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
42 $ bzr init -q source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
43 $ cd source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
44 $ mkdir tpyo
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
45 $ echo content > tpyo/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
46 $ bzr add -q tpyo
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
47 $ bzr commit -q -m 'Added directory'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
48 $ bzr mv tpyo typo
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
49 tpyo => typo
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
50 $ bzr commit -q -m 'Oops, typo'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
51 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
52 $ hg convert source source-hg
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
53 initializing destination source-hg repository
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
54 scanning source...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
55 sorting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
56 converting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
57 1 Added directory
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
58 0 Oops, typo
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
59 $ manifest source-hg 0
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
60 % manifest of 0
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
61 644 tpyo/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
62 $ manifest source-hg tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
63 % manifest of tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
64 644 typo/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
65 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
66
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
67 nested directory renames
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
68
12514
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
69 $ mkdir test-nested-dir-rename
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
70 $ cd test-nested-dir-rename
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
71 $ bzr init -q source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
72 $ cd source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
73 $ mkdir -p firstlevel/secondlevel/thirdlevel
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
74 $ echo content > firstlevel/secondlevel/file
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
75 $ echo this_needs_to_be_there_too > firstlevel/secondlevel/thirdlevel/stuff
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
76 $ bzr add -q firstlevel
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
77 $ bzr commit -q -m 'Added nested directories'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
78 $ bzr mv firstlevel/secondlevel secondlevel
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
79 firstlevel/secondlevel => secondlevel
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
80 $ bzr commit -q -m 'Moved secondlevel one level up'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
81 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
82 $ hg convert source source-hg
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
83 initializing destination source-hg repository
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
84 scanning source...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
85 sorting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
86 converting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
87 1 Added nested directories
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
88 0 Moved secondlevel one level up
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
89 $ manifest source-hg tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
90 % manifest of tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
91 644 secondlevel/file
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
92 644 secondlevel/thirdlevel/stuff
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
93 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
94
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
95 directory remove
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
96
12514
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
97 $ mkdir test-dir-remove
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
98 $ cd test-dir-remove
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
99 $ bzr init -q source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
100 $ cd source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
101 $ mkdir src
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
102 $ echo content > src/sourcecode
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
103 $ bzr add -q src
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
104 $ bzr commit -q -m 'Added directory'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
105 $ bzr rm -q src
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
106 $ bzr commit -q -m 'Removed directory'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
107 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
108 $ hg convert source source-hg
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
109 initializing destination source-hg repository
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
110 scanning source...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
111 sorting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
112 converting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
113 1 Added directory
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
114 0 Removed directory
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
115 $ manifest source-hg 0
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
116 % manifest of 0
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
117 644 src/sourcecode
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
118 $ manifest source-hg tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
119 % manifest of tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
120 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
121
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
122 directory replace
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
123
12514
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
124 $ mkdir test-dir-replace
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
125 $ cd test-dir-replace
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
126 $ bzr init -q source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
127 $ cd source
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
128 $ mkdir first second
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
129 $ echo content > first/file
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
130 $ echo morecontent > first/dummy
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
131 $ echo othercontent > second/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
132 $ bzr add -q first second
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
133 $ bzr commit -q -m 'Initial layout'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
134 $ bzr mv first/file second/file
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
135 first/file => second/file
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
136 $ bzr mv first third
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
137 first => third
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
138 $ bzr commit -q -m 'Some conflicting moves'
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
139 $ cd ..
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
140 $ hg convert source source-hg
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
141 initializing destination source-hg repository
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
142 scanning source...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
143 sorting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
144 converting...
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
145 1 Initial layout
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
146 0 Some conflicting moves
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
147 $ manifest source-hg tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
148 % manifest of tip
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
149 644 second/file
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
150 644 second/something
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
151 644 third/dummy
c40b4744071a tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
152 $ cd ..
15461
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
153
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
154 divergent nested renames (issue3089)
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
155
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
156 $ mkdir test-divergent-renames
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
157 $ cd test-divergent-renames
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
158 $ bzr init -q source
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
159 $ cd source
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
160 $ mkdir -p a/c
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
161 $ echo a > a/fa
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
162 $ echo c > a/c/fc
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
163 $ bzr add -q a
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
164 $ bzr commit -q -m 'Initial layout'
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
165 $ bzr mv a b
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
166 a => b
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
167 $ mkdir a
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
168 $ bzr add a
15487
3c72117a7a0e convert/bzr: fix test of divergent nested renames for bzr 1.x
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15461
diff changeset
169 add(ed|ing) a (re)
15461
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
170 $ bzr mv b/c a/c
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
171 b/c => a/c
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
172 $ bzr status
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
173 added:
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
174 a/
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
175 renamed:
15487
3c72117a7a0e convert/bzr: fix test of divergent nested renames for bzr 1.x
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15461
diff changeset
176 a/? => b/? (re)
3c72117a7a0e convert/bzr: fix test of divergent nested renames for bzr 1.x
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15461
diff changeset
177 a/c/? => a/c/? (re)
15461
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
178 $ bzr commit -q -m 'Divergent renames'
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
179 $ cd ..
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
180 $ hg convert source source-hg
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
181 initializing destination source-hg repository
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
182 scanning source...
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
183 sorting...
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
184 converting...
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
185 1 Initial layout
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
186 0 Divergent renames
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
187 $ hg -R source-hg st -C --change 1
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
188 A b/fa
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
189 a/fa
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
190 R a/fa
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
191 $ hg -R source-hg manifest -r 1
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
192 a/c/fc
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
193 b/fa
6ba2fc0a87ab convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents: 12514
diff changeset
194 $ cd ..