Show More
@@ -39,12 +39,12 b' create monotone repository' | |||
|
39 | 39 | $ python -c 'file("bin", "wb").write("a\\x00b")' |
|
40 | 40 | $ echo c > c |
|
41 | 41 | $ mtn add a dir/b dir/d c bin |
|
42 | mtn: adding a to workspace manifest | |
|
43 | mtn: adding bin to workspace manifest | |
|
44 | mtn: adding c to workspace manifest | |
|
45 | mtn: adding dir to workspace manifest | |
|
46 | mtn: adding dir/b to workspace manifest | |
|
47 | mtn: adding dir/d to workspace manifest | |
|
42 | mtn: adding 'a' to workspace manifest | |
|
43 | mtn: adding 'bin' to workspace manifest | |
|
44 | mtn: adding 'c' to workspace manifest | |
|
45 | mtn: adding 'dir' to workspace manifest | |
|
46 | mtn: adding 'dir/b' to workspace manifest | |
|
47 | mtn: adding 'dir/d' to workspace manifest | |
|
48 | 48 | $ mtn ci -m initialize |
|
49 | 49 | mtn: beginning commit on branch 'com.selenic.test' |
|
50 | 50 | mtn: committed revision 0f6e5e4f2e7d2a8ef312408f57618abf026afd90 |
@@ -52,12 +52,12 b' create monotone repository' | |||
|
52 | 52 | update monotone working directory |
|
53 | 53 | |
|
54 | 54 | $ mtn mv a dir/a |
|
55 | mtn: skipping dir, already accounted for in workspace | |
|
56 | mtn: renaming a to dir/a in workspace manifest | |
|
55 | mtn: skipping 'dir', already accounted for in workspace | |
|
56 | mtn: renaming 'a' to 'dir/a' in workspace manifest | |
|
57 | 57 | $ echo a >> dir/a |
|
58 | 58 | $ echo b >> dir/b |
|
59 | 59 | $ mtn drop c |
|
60 | mtn: dropping c from workspace manifest | |
|
60 | mtn: dropping 'c' from workspace manifest | |
|
61 | 61 | $ python -c 'file("bin", "wb").write("b\\x00c")' |
|
62 | 62 | $ mtn ci -m update1 |
|
63 | 63 | mtn: beginning commit on branch 'com.selenic.test' |
@@ -77,11 +77,11 b' convert once' | |||
|
77 | 77 | $ cd workingdir |
|
78 | 78 | $ echo e > e |
|
79 | 79 | $ mtn add e |
|
80 | mtn: adding e to workspace manifest | |
|
80 | mtn: adding 'e' to workspace manifest | |
|
81 | 81 | $ mtn drop dir/b |
|
82 | mtn: dropping dir/b from workspace manifest | |
|
82 | mtn: dropping 'dir/b' from workspace manifest | |
|
83 | 83 | $ mtn mv bin bin2 |
|
84 | mtn: renaming bin to bin2 in workspace manifest | |
|
84 | mtn: renaming 'bin' to 'bin2' in workspace manifest | |
|
85 | 85 | $ mtn ci -m 'update2 "with" quotes' |
|
86 | 86 | mtn: beginning commit on branch 'com.selenic.test' |
|
87 | 87 | mtn: committed revision ebe58335d85d8cb176b6d0a12be04f5314b998da |
@@ -93,17 +93,17 b' test directory move' | |||
|
93 | 93 | $ echo file1 > dir1/subdir1/file1 |
|
94 | 94 | $ echo file2 > dir1/subdir2_other/file1 |
|
95 | 95 | $ mtn add dir1/subdir1/file1 dir1/subdir2_other/file1 |
|
96 | mtn: adding dir1 to workspace manifest | |
|
97 | mtn: adding dir1/subdir1 to workspace manifest | |
|
98 | mtn: adding dir1/subdir1/file1 to workspace manifest | |
|
99 | mtn: adding dir1/subdir2_other to workspace manifest | |
|
100 | mtn: adding dir1/subdir2_other/file1 to workspace manifest | |
|
96 | mtn: adding 'dir1' to workspace manifest | |
|
97 | mtn: adding 'dir1/subdir1' to workspace manifest | |
|
98 | mtn: adding 'dir1/subdir1/file1' to workspace manifest | |
|
99 | mtn: adding 'dir1/subdir2_other' to workspace manifest | |
|
100 | mtn: adding 'dir1/subdir2_other/file1' to workspace manifest | |
|
101 | 101 | $ mtn ci -m createdir1 |
|
102 | 102 | mtn: beginning commit on branch 'com.selenic.test' |
|
103 | 103 | mtn: committed revision a8d62bc04fee4d2936d28e98bbcc81686dd74306 |
|
104 | 104 | $ mtn rename dir1/subdir1 dir1/subdir2 |
|
105 | mtn: skipping dir1, already accounted for in workspace | |
|
106 | mtn: renaming dir1/subdir1 to dir1/subdir2 in workspace manifest | |
|
105 | mtn: skipping 'dir1', already accounted for in workspace | |
|
106 | mtn: renaming 'dir1/subdir1' to 'dir1/subdir2' in workspace manifest | |
|
107 | 107 | $ mtn ci -m movedir1 |
|
108 | 108 | mtn: beginning commit on branch 'com.selenic.test' |
|
109 | 109 | mtn: committed revision 2c3d241bbbfe538b1b51d910f5676407e3f4d3a6 |
@@ -111,12 +111,12 b' test directory move' | |||
|
111 | 111 | test subdirectory move |
|
112 | 112 | |
|
113 | 113 | $ mtn mv dir dir2 |
|
114 | mtn: renaming dir to dir2 in workspace manifest | |
|
114 | mtn: renaming 'dir' to 'dir2' in workspace manifest | |
|
115 | 115 | $ echo newfile > dir2/newfile |
|
116 | 116 | $ mtn drop dir2/d |
|
117 | mtn: dropping dir2/d from workspace manifest | |
|
117 | mtn: dropping 'dir2/d' from workspace manifest | |
|
118 | 118 | $ mtn add dir2/newfile |
|
119 | mtn: adding dir2/newfile to workspace manifest | |
|
119 | mtn: adding 'dir2/newfile' to workspace manifest | |
|
120 | 120 | $ mtn ci -m movedir |
|
121 | 121 | mtn: beginning commit on branch 'com.selenic.test' |
|
122 | 122 | mtn: committed revision fdb5a02dae8bfce3a79b3393680af471016e1b4c |
@@ -132,10 +132,10 b' Test directory removal with empty direct' | |||
|
132 | 132 | mtn: beginning commit on branch 'com.selenic.test' |
|
133 | 133 | mtn: committed revision 8bbf76d717001d24964e4604739fdcd0f539fc88 |
|
134 | 134 | $ mtn drop -R dir2/dir |
|
135 | mtn: dropping dir2/dir/subdir/f from workspace manifest | |
|
136 | mtn: dropping dir2/dir/subdir from workspace manifest | |
|
137 | mtn: dropping dir2/dir/emptydir from workspace manifest | |
|
138 | mtn: dropping dir2/dir from workspace manifest | |
|
135 | mtn: dropping 'dir2/dir/subdir/f' from workspace manifest | |
|
136 | mtn: dropping 'dir2/dir/subdir' from workspace manifest | |
|
137 | mtn: dropping 'dir2/dir/emptydir' from workspace manifest | |
|
138 | mtn: dropping 'dir2/dir' from workspace manifest | |
|
139 | 139 | $ mtn ci -m dropdirectory |
|
140 | 140 | mtn: beginning commit on branch 'com.selenic.test' |
|
141 | 141 | mtn: committed revision 2323d4bc324e6c82628dc04d47a9fd32ad24e322 |
@@ -145,18 +145,18 b' test directory and file move' | |||
|
145 | 145 | $ mkdir -p dir3/d1 |
|
146 | 146 | $ echo a > dir3/a |
|
147 | 147 | $ mtn add dir3/a dir3/d1 |
|
148 | mtn: adding dir3 to workspace manifest | |
|
149 | mtn: adding dir3/a to workspace manifest | |
|
150 | mtn: adding dir3/d1 to workspace manifest | |
|
148 | mtn: adding 'dir3' to workspace manifest | |
|
149 | mtn: adding 'dir3/a' to workspace manifest | |
|
150 | mtn: adding 'dir3/d1' to workspace manifest | |
|
151 | 151 | $ mtn ci -m dirfilemove |
|
152 | 152 | mtn: beginning commit on branch 'com.selenic.test' |
|
153 | 153 | mtn: committed revision 47b192f720faa622f48c68d1eb075b26d405aa8b |
|
154 | 154 | $ mtn mv dir3/a dir3/d1/a |
|
155 | mtn: skipping dir3/d1, already accounted for in workspace | |
|
156 | mtn: renaming dir3/a to dir3/d1/a in workspace manifest | |
|
155 | mtn: skipping 'dir3/d1', already accounted for in workspace | |
|
156 | mtn: renaming 'dir3/a' to 'dir3/d1/a' in workspace manifest | |
|
157 | 157 | $ mtn mv dir3/d1 dir3/d2 |
|
158 | mtn: skipping dir3, already accounted for in workspace | |
|
159 | mtn: renaming dir3/d1 to dir3/d2 in workspace manifest | |
|
158 | mtn: skipping 'dir3', already accounted for in workspace | |
|
159 | mtn: renaming 'dir3/d1' to 'dir3/d2' in workspace manifest | |
|
160 | 160 | $ mtn ci -m dirfilemove2 |
|
161 | 161 | mtn: beginning commit on branch 'com.selenic.test' |
|
162 | 162 | mtn: committed revision 8b543a400d3ee7f6d4bb1835b9b9e3747c8cb632 |
@@ -167,17 +167,17 b' test directory move into another directo' | |||
|
167 | 167 | $ mkdir dir5 |
|
168 | 168 | $ echo a > dir4/a |
|
169 | 169 | $ mtn add dir4/a dir5 |
|
170 | mtn: adding dir4 to workspace manifest | |
|
171 | mtn: adding dir4/a to workspace manifest | |
|
172 | mtn: adding dir5 to workspace manifest | |
|
170 | mtn: adding 'dir4' to workspace manifest | |
|
171 | mtn: adding 'dir4/a' to workspace manifest | |
|
172 | mtn: adding 'dir5' to workspace manifest | |
|
173 | 173 | $ mtn ci -m dirdirmove |
|
174 | 174 | mtn: beginning commit on branch 'com.selenic.test' |
|
175 | 175 | mtn: committed revision 466e0b2afc7a55aa2b4ab2f57cb240bb6cd66fc7 |
|
176 | 176 | $ mtn mv dir5 dir6 |
|
177 | mtn: renaming dir5 to dir6 in workspace manifest | |
|
177 | mtn: renaming 'dir5' to 'dir6' in workspace manifest | |
|
178 | 178 | $ mtn mv dir4 dir6/dir4 |
|
179 | mtn: skipping dir6, already accounted for in workspace | |
|
180 | mtn: renaming dir4 to dir6/dir4 in workspace manifest | |
|
179 | mtn: skipping 'dir6', already accounted for in workspace | |
|
180 | mtn: renaming 'dir4' to 'dir6/dir4' in workspace manifest | |
|
181 | 181 | $ mtn ci -m dirdirmove2 |
|
182 | 182 | mtn: beginning commit on branch 'com.selenic.test' |
|
183 | 183 | mtn: committed revision 3d1f77ebad0c23a5d14911be3b670f990991b749 |
@@ -189,21 +189,21 b' test diverging directory moves' | |||
|
189 | 189 | $ echo b > dir7/dir9/b |
|
190 | 190 | $ echo c > dir7/c |
|
191 | 191 | $ mtn add -R dir7 |
|
192 | mtn: adding dir7 to workspace manifest | |
|
193 | mtn: adding dir7/c to workspace manifest | |
|
194 | mtn: adding dir7/dir9 to workspace manifest | |
|
195 | mtn: adding dir7/dir9/b to workspace manifest | |
|
196 | mtn: adding dir7/dir9/dir8 to workspace manifest | |
|
197 | mtn: adding dir7/dir9/dir8/a to workspace manifest | |
|
192 | mtn: adding 'dir7' to workspace manifest | |
|
193 | mtn: adding 'dir7/c' to workspace manifest | |
|
194 | mtn: adding 'dir7/dir9' to workspace manifest | |
|
195 | mtn: adding 'dir7/dir9/b' to workspace manifest | |
|
196 | mtn: adding 'dir7/dir9/dir8' to workspace manifest | |
|
197 | mtn: adding 'dir7/dir9/dir8/a' to workspace manifest | |
|
198 | 198 | $ mtn ci -m divergentdirmove |
|
199 | 199 | mtn: beginning commit on branch 'com.selenic.test' |
|
200 | 200 | mtn: committed revision 08a08511f18b428d840199b062de90d0396bc2ed |
|
201 | 201 | $ mtn mv dir7 dir7-2 |
|
202 | mtn: renaming dir7 to dir7-2 in workspace manifest | |
|
202 | mtn: renaming 'dir7' to 'dir7-2' in workspace manifest | |
|
203 | 203 | $ mtn mv dir7-2/dir9 dir9-2 |
|
204 | mtn: renaming dir7-2/dir9 to dir9-2 in workspace manifest | |
|
204 | mtn: renaming 'dir7-2/dir9' to 'dir9-2' in workspace manifest | |
|
205 | 205 | $ mtn mv dir9-2/dir8 dir8-2 |
|
206 | mtn: renaming dir9-2/dir8 to dir8-2 in workspace manifest | |
|
206 | mtn: renaming 'dir9-2/dir8' to 'dir8-2' in workspace manifest | |
|
207 | 207 | $ mtn ci -m divergentdirmove2 |
|
208 | 208 | mtn: beginning commit on branch 'com.selenic.test' |
|
209 | 209 | mtn: committed revision 4a736634505795f17786fffdf2c9cbf5b11df6f6 |
@@ -214,7 +214,7 b' test large file support (> 32kB)' | |||
|
214 | 214 | $ $TESTDIR/md5sum.py large-file |
|
215 | 215 | 5d6de8a95c3b6bf9e0ffb808ba5299c1 large-file |
|
216 | 216 | $ mtn add large-file |
|
217 | mtn: adding large-file to workspace manifest | |
|
217 | mtn: adding 'large-file' to workspace manifest | |
|
218 | 218 | $ mtn ci -m largefile |
|
219 | 219 | mtn: beginning commit on branch 'com.selenic.test' |
|
220 | 220 | mtn: committed revision f0a20fecd10dc4392d18fe69a03f1f4919d3387b |
General Comments 0
You need to be logged in to leave comments.
Login now