##// END OF EJS Templates
py3: add some glob to make output compatible with python 3...
Pulkit Goyal -
r40266:0b46e1aa default
parent child Browse files
Show More
@@ -1,608 +1,610 b''
1 test-abort-checkin.t
1 test-abort-checkin.t
2 test-absorb-filefixupstate.py
2 test-absorb-filefixupstate.py
3 test-absorb-phase.t
3 test-absorb-phase.t
4 test-absorb-rename.t
4 test-absorb-rename.t
5 test-absorb-strip.t
5 test-absorb-strip.t
6 test-absorb.t
6 test-absorb.t
7 test-add.t
7 test-add.t
8 test-addremove-similar.t
8 test-addremove-similar.t
9 test-addremove.t
9 test-addremove.t
10 test-alias.t
10 test-alias.t
11 test-amend-subrepo.t
11 test-amend-subrepo.t
12 test-amend.t
12 test-amend.t
13 test-ancestor.py
13 test-ancestor.py
14 test-annotate.py
14 test-annotate.py
15 test-annotate.t
15 test-annotate.t
16 test-archive-symlinks.t
16 test-archive-symlinks.t
17 test-atomictempfile.py
17 test-atomictempfile.py
18 test-audit-path.t
18 test-audit-path.t
19 test-audit-subrepo.t
19 test-audit-subrepo.t
20 test-automv.t
20 test-automv.t
21 test-backout.t
21 test-backout.t
22 test-backwards-remove.t
22 test-backwards-remove.t
23 test-bad-pull.t
23 test-bad-pull.t
24 test-basic.t
24 test-basic.t
25 test-bdiff.py
25 test-bdiff.py
26 test-bheads.t
26 test-bheads.t
27 test-bisect.t
27 test-bisect.t
28 test-bisect2.t
28 test-bisect2.t
29 test-bisect3.t
29 test-bisect3.t
30 test-blackbox.t
30 test-blackbox.t
31 test-bookmarks-current.t
31 test-bookmarks-current.t
32 test-bookmarks-merge.t
32 test-bookmarks-merge.t
33 test-bookmarks-pushpull.t
33 test-bookmarks-pushpull.t
34 test-bookmarks-rebase.t
34 test-bookmarks-rebase.t
35 test-bookmarks-strip.t
35 test-bookmarks-strip.t
36 test-bookmarks.t
36 test-bookmarks.t
37 test-branch-change.t
37 test-branch-change.t
38 test-branch-option.t
38 test-branch-option.t
39 test-branch-tag-confict.t
39 test-branch-tag-confict.t
40 test-branches.t
40 test-branches.t
41 test-bundle-phases.t
41 test-bundle-phases.t
42 test-bundle-r.t
42 test-bundle-r.t
43 test-bundle-type.t
43 test-bundle-type.t
44 test-bundle-vs-outgoing.t
44 test-bundle-vs-outgoing.t
45 test-bundle.t
45 test-bundle.t
46 test-bundle2-exchange.t
46 test-bundle2-exchange.t
47 test-bundle2-format.t
47 test-bundle2-format.t
48 test-bundle2-multiple-changegroups.t
48 test-bundle2-multiple-changegroups.t
49 test-bundle2-pushback.t
49 test-bundle2-pushback.t
50 test-bundle2-remote-changegroup.t
50 test-bundle2-remote-changegroup.t
51 test-cappedreader.py
51 test-cappedreader.py
52 test-casecollision.t
52 test-casecollision.t
53 test-cat.t
53 test-cat.t
54 test-cbor.py
54 test-cbor.py
55 test-censor.t
55 test-censor.t
56 test-changelog-exec.t
56 test-changelog-exec.t
57 test-check-code.t
57 test-check-code.t
58 test-check-commit.t
58 test-check-commit.t
59 test-check-execute.t
59 test-check-execute.t
60 test-check-interfaces.py
60 test-check-interfaces.py
61 test-check-module-imports.t
61 test-check-module-imports.t
62 test-check-py3-compat.t
62 test-check-py3-compat.t
63 test-check-pyflakes.t
63 test-check-pyflakes.t
64 test-check-pylint.t
64 test-check-pylint.t
65 test-check-shbang.t
65 test-check-shbang.t
66 test-children.t
66 test-children.t
67 test-clone-cgi.t
67 test-clone-cgi.t
68 test-clone-pull-corruption.t
68 test-clone-pull-corruption.t
69 test-clone-r.t
69 test-clone-r.t
70 test-clone-uncompressed.t
70 test-clone-uncompressed.t
71 test-clone-update-order.t
71 test-clone-update-order.t
72 test-clone.t
72 test-clone.t
73 test-clonebundles.t
73 test-clonebundles.t
74 test-close-head.t
74 test-close-head.t
75 test-commit-amend.t
75 test-commit-amend.t
76 test-commit-interactive.t
76 test-commit-interactive.t
77 test-commit-multiple.t
77 test-commit-multiple.t
78 test-commit-unresolved.t
78 test-commit-unresolved.t
79 test-commit.t
79 test-commit.t
80 test-committer.t
80 test-committer.t
81 test-completion.t
81 test-completion.t
82 test-config-env.py
82 test-config-env.py
83 test-config.t
83 test-config.t
84 test-conflict.t
84 test-conflict.t
85 test-confused-revert.t
85 test-confused-revert.t
86 test-context.py
86 test-context.py
87 test-contrib-check-code.t
87 test-contrib-check-code.t
88 test-contrib-check-commit.t
88 test-contrib-check-commit.t
89 test-contrib-dumprevlog.t
89 test-contrib-dumprevlog.t
90 test-contrib-perf.t
90 test-contrib-perf.t
91 test-contrib-testparseutil.t
91 test-contrib-testparseutil.t
92 test-convert-authormap.t
92 test-convert-authormap.t
93 test-convert-clonebranches.t
93 test-convert-clonebranches.t
94 test-convert-cvs-branch.t
94 test-convert-cvs-branch.t
95 test-convert-cvs-detectmerge.t
95 test-convert-cvs-detectmerge.t
96 test-convert-cvs-synthetic.t
96 test-convert-cvs-synthetic.t
97 test-convert-cvs.t
97 test-convert-cvs.t
98 test-convert-cvsnt-mergepoints.t
98 test-convert-cvsnt-mergepoints.t
99 test-convert-datesort.t
99 test-convert-datesort.t
100 test-convert-filemap.t
100 test-convert-filemap.t
101 test-convert-hg-sink.t
101 test-convert-hg-sink.t
102 test-convert-hg-source.t
102 test-convert-hg-source.t
103 test-convert-hg-startrev.t
103 test-convert-hg-startrev.t
104 test-convert-splicemap.t
104 test-convert-splicemap.t
105 test-convert-tagsbranch-topology.t
105 test-convert-tagsbranch-topology.t
106 test-copy-move-merge.t
106 test-copy-move-merge.t
107 test-copy.t
107 test-copy.t
108 test-copytrace-heuristics.t
108 test-copytrace-heuristics.t
109 test-debugbuilddag.t
109 test-debugbuilddag.t
110 test-debugbundle.t
110 test-debugbundle.t
111 test-debugcommands.t
111 test-debugcommands.t
112 test-debugextensions.t
112 test-debugextensions.t
113 test-debugindexdot.t
113 test-debugindexdot.t
114 test-debugrename.t
114 test-debugrename.t
115 test-default-push.t
115 test-default-push.t
116 test-diff-antipatience.t
116 test-diff-antipatience.t
117 test-diff-binary-file.t
117 test-diff-binary-file.t
118 test-diff-change.t
118 test-diff-change.t
119 test-diff-copy-depth.t
119 test-diff-copy-depth.t
120 test-diff-hashes.t
120 test-diff-hashes.t
121 test-diff-ignore-whitespace.t
121 test-diff-ignore-whitespace.t
122 test-diff-indent-heuristic.t
122 test-diff-indent-heuristic.t
123 test-diff-issue2761.t
123 test-diff-issue2761.t
124 test-diff-newlines.t
124 test-diff-newlines.t
125 test-diff-reverse.t
125 test-diff-reverse.t
126 test-diff-subdir.t
126 test-diff-subdir.t
127 test-diff-unified.t
127 test-diff-unified.t
128 test-diff-upgrade.t
128 test-diff-upgrade.t
129 test-diffdir.t
129 test-diffdir.t
130 test-diffstat.t
130 test-diffstat.t
131 test-directaccess.t
131 test-directaccess.t
132 test-dirstate-backup.t
132 test-dirstate-backup.t
133 test-dirstate-nonnormalset.t
133 test-dirstate-nonnormalset.t
134 test-dirstate.t
134 test-dirstate.t
135 test-dispatch.py
135 test-dispatch.py
136 test-doctest.py
136 test-doctest.py
137 test-double-merge.t
137 test-double-merge.t
138 test-drawdag.t
138 test-drawdag.t
139 test-duplicateoptions.py
139 test-duplicateoptions.py
140 test-editor-filename.t
140 test-editor-filename.t
141 test-empty-dir.t
141 test-empty-dir.t
142 test-empty-file.t
142 test-empty-file.t
143 test-empty-group.t
143 test-empty-group.t
144 test-empty.t
144 test-empty.t
145 test-encode.t
145 test-encode.t
146 test-encoding-func.py
146 test-encoding-func.py
147 test-encoding.t
147 test-encoding.t
148 test-eol-add.t
148 test-eol-add.t
149 test-eol-clone.t
149 test-eol-clone.t
150 test-eol-hook.t
150 test-eol-hook.t
151 test-eol-patch.t
151 test-eol-patch.t
152 test-eol-tag.t
152 test-eol-tag.t
153 test-eol-update.t
153 test-eol-update.t
154 test-eol.t
154 test-eol.t
155 test-eolfilename.t
155 test-eolfilename.t
156 test-excessive-merge.t
156 test-excessive-merge.t
157 test-exchange-obsmarkers-case-A1.t
157 test-exchange-obsmarkers-case-A1.t
158 test-exchange-obsmarkers-case-A2.t
158 test-exchange-obsmarkers-case-A2.t
159 test-exchange-obsmarkers-case-A3.t
159 test-exchange-obsmarkers-case-A3.t
160 test-exchange-obsmarkers-case-A4.t
160 test-exchange-obsmarkers-case-A4.t
161 test-exchange-obsmarkers-case-A5.t
161 test-exchange-obsmarkers-case-A5.t
162 test-exchange-obsmarkers-case-A6.t
162 test-exchange-obsmarkers-case-A6.t
163 test-exchange-obsmarkers-case-A7.t
163 test-exchange-obsmarkers-case-A7.t
164 test-exchange-obsmarkers-case-B1.t
164 test-exchange-obsmarkers-case-B1.t
165 test-exchange-obsmarkers-case-B2.t
165 test-exchange-obsmarkers-case-B2.t
166 test-exchange-obsmarkers-case-B3.t
166 test-exchange-obsmarkers-case-B3.t
167 test-exchange-obsmarkers-case-B4.t
167 test-exchange-obsmarkers-case-B4.t
168 test-exchange-obsmarkers-case-B5.t
168 test-exchange-obsmarkers-case-B5.t
169 test-exchange-obsmarkers-case-B6.t
169 test-exchange-obsmarkers-case-B6.t
170 test-exchange-obsmarkers-case-B7.t
170 test-exchange-obsmarkers-case-B7.t
171 test-exchange-obsmarkers-case-C1.t
171 test-exchange-obsmarkers-case-C1.t
172 test-exchange-obsmarkers-case-C2.t
172 test-exchange-obsmarkers-case-C2.t
173 test-exchange-obsmarkers-case-C3.t
173 test-exchange-obsmarkers-case-C3.t
174 test-exchange-obsmarkers-case-C4.t
174 test-exchange-obsmarkers-case-C4.t
175 test-exchange-obsmarkers-case-D1.t
175 test-exchange-obsmarkers-case-D1.t
176 test-exchange-obsmarkers-case-D2.t
176 test-exchange-obsmarkers-case-D2.t
177 test-exchange-obsmarkers-case-D3.t
177 test-exchange-obsmarkers-case-D3.t
178 test-exchange-obsmarkers-case-D4.t
178 test-exchange-obsmarkers-case-D4.t
179 test-execute-bit.t
179 test-execute-bit.t
180 test-export.t
180 test-export.t
181 test-extdata.t
181 test-extdata.t
182 test-extdiff.t
182 test-extdiff.t
183 test-extensions-afterloaded.t
183 test-extensions-afterloaded.t
184 test-extensions-wrapfunction.py
184 test-extensions-wrapfunction.py
185 test-extra-filelog-entry.t
185 test-extra-filelog-entry.t
186 test-fetch.t
186 test-fetch.t
187 test-filebranch.t
187 test-filebranch.t
188 test-filecache.py
188 test-filecache.py
189 test-filelog.py
189 test-filelog.py
190 test-fileset-generated.t
190 test-fileset-generated.t
191 test-fileset.t
191 test-fileset.t
192 test-fix-topology.t
192 test-fix-topology.t
193 test-flags.t
193 test-flags.t
194 test-generaldelta.t
194 test-generaldelta.t
195 test-getbundle.t
195 test-getbundle.t
196 test-git-export.t
196 test-git-export.t
197 test-globalopts.t
197 test-globalopts.t
198 test-glog-beautifygraph.t
198 test-glog-beautifygraph.t
199 test-glog-topological.t
199 test-glog-topological.t
200 test-glog.t
200 test-glog.t
201 test-gpg.t
201 test-gpg.t
202 test-graft.t
202 test-graft.t
203 test-grep.t
203 test-grep.t
204 test-hg-parseurl.py
204 test-hg-parseurl.py
205 test-hghave.t
205 test-hghave.t
206 test-hgignore.t
206 test-hgignore.t
207 test-hgk.t
207 test-hgk.t
208 test-hgrc.t
208 test-hgrc.t
209 test-hgweb-annotate-whitespace.t
209 test-hgweb-annotate-whitespace.t
210 test-hgweb-bundle.t
210 test-hgweb-bundle.t
211 test-hgweb-csp.t
211 test-hgweb-csp.t
212 test-hgweb-descend-empties.t
212 test-hgweb-descend-empties.t
213 test-hgweb-diffs.t
213 test-hgweb-diffs.t
214 test-hgweb-empty.t
214 test-hgweb-empty.t
215 test-hgweb-filelog.t
215 test-hgweb-filelog.t
216 test-hgweb-non-interactive.t
216 test-hgweb-non-interactive.t
217 test-hgweb-raw.t
217 test-hgweb-raw.t
218 test-hgweb-removed.t
218 test-hgweb-removed.t
219 test-hgweb.t
219 test-hgweb.t
220 test-hgwebdir-paths.py
220 test-hgwebdir-paths.py
221 test-hgwebdirsym.t
221 test-hgwebdirsym.t
222 test-histedit-arguments.t
222 test-histedit-arguments.t
223 test-histedit-base.t
223 test-histedit-base.t
224 test-histedit-bookmark-motion.t
224 test-histedit-bookmark-motion.t
225 test-histedit-commute.t
225 test-histedit-commute.t
226 test-histedit-drop.t
226 test-histedit-drop.t
227 test-histedit-edit.t
227 test-histedit-edit.t
228 test-histedit-fold-non-commute.t
228 test-histedit-fold-non-commute.t
229 test-histedit-fold.t
229 test-histedit-fold.t
230 test-histedit-no-backup.t
230 test-histedit-no-backup.t
231 test-histedit-no-change.t
231 test-histedit-no-change.t
232 test-histedit-non-commute-abort.t
232 test-histedit-non-commute-abort.t
233 test-histedit-non-commute.t
233 test-histedit-non-commute.t
234 test-histedit-obsolete.t
234 test-histedit-obsolete.t
235 test-histedit-outgoing.t
235 test-histedit-outgoing.t
236 test-histedit-templates.t
236 test-histedit-templates.t
237 test-http-branchmap.t
237 test-http-branchmap.t
238 test-http-bundle1.t
238 test-http-bundle1.t
239 test-http-clone-r.t
239 test-http-clone-r.t
240 test-http-permissions.t
240 test-http-permissions.t
241 test-http.t
241 test-http.t
242 test-hybridencode.py
242 test-hybridencode.py
243 test-i18n.t
243 test-i18n.t
244 test-identify.t
244 test-identify.t
245 test-impexp-branch.t
245 test-impexp-branch.t
246 test-import-bypass.t
246 test-import-bypass.t
247 test-import-eol.t
247 test-import-eol.t
248 test-import-merge.t
248 test-import-merge.t
249 test-import-unknown.t
249 test-import-unknown.t
250 test-import.t
250 test-import.t
251 test-imports-checker.t
251 test-imports-checker.t
252 test-incoming-outgoing.t
252 test-incoming-outgoing.t
253 test-inherit-mode.t
253 test-inherit-mode.t
254 test-init.t
254 test-init.t
255 test-issue1089.t
255 test-issue1089.t
256 test-issue1102.t
256 test-issue1102.t
257 test-issue1175.t
257 test-issue1175.t
258 test-issue1306.t
258 test-issue1306.t
259 test-issue1438.t
259 test-issue1438.t
260 test-issue1502.t
260 test-issue1502.t
261 test-issue1802.t
261 test-issue1802.t
262 test-issue1877.t
262 test-issue1877.t
263 test-issue1993.t
263 test-issue1993.t
264 test-issue2137.t
264 test-issue2137.t
265 test-issue3084.t
265 test-issue3084.t
266 test-issue4074.t
266 test-issue4074.t
267 test-issue522.t
267 test-issue522.t
268 test-issue586.t
268 test-issue586.t
269 test-issue5979.t
269 test-issue5979.t
270 test-issue612.t
270 test-issue612.t
271 test-issue619.t
271 test-issue619.t
272 test-issue660.t
272 test-issue660.t
273 test-issue672.t
273 test-issue672.t
274 test-issue842.t
274 test-issue842.t
275 test-journal-exists.t
275 test-journal-exists.t
276 test-journal-share.t
276 test-journal-share.t
277 test-journal.t
277 test-journal.t
278 test-known.t
278 test-known.t
279 test-largefiles-cache.t
279 test-largefiles-cache.t
280 test-largefiles-misc.t
280 test-largefiles-misc.t
281 test-largefiles-small-disk.t
281 test-largefiles-small-disk.t
282 test-largefiles-update.t
282 test-largefiles-update.t
283 test-largefiles.t
283 test-largefiles.t
284 test-lfs-largefiles.t
284 test-lfs-largefiles.t
285 test-lfs-pointer.py
285 test-lfs-pointer.py
286 test-linelog.py
286 test-linelog.py
287 test-linerange.py
287 test-linerange.py
288 test-locate.t
288 test-locate.t
289 test-lock-badness.t
289 test-lock-badness.t
290 test-log-linerange.t
290 test-log-linerange.t
291 test-log.t
291 test-log.t
292 test-logexchange.t
292 test-logexchange.t
293 test-lrucachedict.py
293 test-lrucachedict.py
294 test-mactext.t
294 test-mactext.t
295 test-mailmap.t
295 test-mailmap.t
296 test-manifest-merging.t
296 test-manifest-merging.t
297 test-manifest.py
297 test-manifest.py
298 test-manifest.t
298 test-manifest.t
299 test-match.py
299 test-match.py
300 test-mdiff.py
300 test-mdiff.py
301 test-merge-changedelete.t
301 test-merge-changedelete.t
302 test-merge-closedheads.t
302 test-merge-closedheads.t
303 test-merge-commit.t
303 test-merge-commit.t
304 test-merge-criss-cross.t
304 test-merge-criss-cross.t
305 test-merge-default.t
305 test-merge-default.t
306 test-merge-force.t
306 test-merge-force.t
307 test-merge-halt.t
307 test-merge-halt.t
308 test-merge-internal-tools-pattern.t
308 test-merge-internal-tools-pattern.t
309 test-merge-local.t
309 test-merge-local.t
310 test-merge-no-file-change.t
310 test-merge-no-file-change.t
311 test-merge-remove.t
311 test-merge-remove.t
312 test-merge-revert.t
312 test-merge-revert.t
313 test-merge-revert2.t
313 test-merge-revert2.t
314 test-merge-subrepos.t
314 test-merge-subrepos.t
315 test-merge-symlinks.t
315 test-merge-symlinks.t
316 test-merge-tools.t
316 test-merge-tools.t
317 test-merge-types.t
317 test-merge-types.t
318 test-merge1.t
318 test-merge1.t
319 test-merge10.t
319 test-merge10.t
320 test-merge2.t
320 test-merge2.t
321 test-merge4.t
321 test-merge4.t
322 test-merge5.t
322 test-merge5.t
323 test-merge6.t
323 test-merge6.t
324 test-merge7.t
324 test-merge7.t
325 test-merge8.t
325 test-merge8.t
326 test-merge9.t
326 test-merge9.t
327 test-minifileset.py
327 test-minifileset.py
328 test-minirst.py
328 test-minirst.py
329 test-mq-git.t
329 test-mq-git.t
330 test-mq-guards.t
330 test-mq-guards.t
331 test-mq-header-date.t
331 test-mq-header-date.t
332 test-mq-header-from.t
332 test-mq-header-from.t
333 test-mq-merge.t
333 test-mq-merge.t
334 test-mq-pull-from-bundle.t
334 test-mq-pull-from-bundle.t
335 test-mq-qclone-http.t
335 test-mq-qclone-http.t
336 test-mq-qdelete.t
336 test-mq-qdelete.t
337 test-mq-qdiff.t
337 test-mq-qdiff.t
338 test-mq-qfold.t
338 test-mq-qfold.t
339 test-mq-qgoto.t
339 test-mq-qgoto.t
340 test-mq-qimport-fail-cleanup.t
340 test-mq-qimport-fail-cleanup.t
341 test-mq-qnew.t
341 test-mq-qnew.t
342 test-mq-qpush-exact.t
342 test-mq-qpush-exact.t
343 test-mq-qpush-fail.t
343 test-mq-qpush-fail.t
344 test-mq-qqueue.t
344 test-mq-qqueue.t
345 test-mq-qrefresh-interactive.t
345 test-mq-qrefresh-interactive.t
346 test-mq-qrefresh-replace-log-message.t
346 test-mq-qrefresh-replace-log-message.t
347 test-mq-qrefresh.t
347 test-mq-qrefresh.t
348 test-mq-qrename.t
348 test-mq-qrename.t
349 test-mq-qsave.t
349 test-mq-qsave.t
350 test-mq-safety.t
350 test-mq-safety.t
351 test-mq-subrepo.t
351 test-mq-subrepo.t
352 test-mq-symlinks.t
352 test-mq-symlinks.t
353 test-mq.t
353 test-mq.t
354 test-mv-cp-st-diff.t
354 test-mv-cp-st-diff.t
355 test-narrow-acl.t
355 test-narrow-acl.t
356 test-narrow-archive.t
356 test-narrow-archive.t
357 test-narrow-clone-no-ellipsis.t
357 test-narrow-clone-no-ellipsis.t
358 test-narrow-clone-non-narrow-server.t
358 test-narrow-clone-non-narrow-server.t
359 test-narrow-clone-nonlinear.t
359 test-narrow-clone-nonlinear.t
360 test-narrow-clone.t
360 test-narrow-clone.t
361 test-narrow-commit.t
361 test-narrow-commit.t
362 test-narrow-copies.t
362 test-narrow-copies.t
363 test-narrow-debugcommands.t
363 test-narrow-debugcommands.t
364 test-narrow-debugrebuilddirstate.t
364 test-narrow-debugrebuilddirstate.t
365 test-narrow-exchange-merges.t
365 test-narrow-exchange-merges.t
366 test-narrow-exchange.t
366 test-narrow-exchange.t
367 test-narrow-expanddirstate.t
367 test-narrow-expanddirstate.t
368 test-narrow-merge.t
368 test-narrow-merge.t
369 test-narrow-patch.t
369 test-narrow-patch.t
370 test-narrow-patterns.t
370 test-narrow-patterns.t
371 test-narrow-pull.t
371 test-narrow-pull.t
372 test-narrow-rebase.t
372 test-narrow-rebase.t
373 test-narrow-shallow-merges.t
373 test-narrow-shallow-merges.t
374 test-narrow-shallow.t
374 test-narrow-shallow.t
375 test-narrow-strip.t
375 test-narrow-strip.t
376 test-narrow-trackedcmd.t
376 test-narrow-trackedcmd.t
377 test-narrow-update.t
377 test-narrow-update.t
378 test-narrow-widen-no-ellipsis.t
378 test-narrow-widen-no-ellipsis.t
379 test-narrow-widen.t
379 test-narrow-widen.t
380 test-narrow.t
380 test-narrow.t
381 test-nested-repo.t
381 test-nested-repo.t
382 test-newbranch.t
382 test-newbranch.t
383 test-newercgi.t
383 test-newercgi.t
384 test-nointerrupt.t
384 test-nointerrupt.t
385 test-obshistory.t
385 test-obshistory.t
386 test-obsmarker-template.t
386 test-obsmarker-template.t
387 test-obsmarkers-effectflag.t
387 test-obsmarkers-effectflag.t
388 test-obsolete-bounds-checking.t
388 test-obsolete-bounds-checking.t
389 test-obsolete-bundle-strip.t
389 test-obsolete-bundle-strip.t
390 test-obsolete-changeset-exchange.t
390 test-obsolete-changeset-exchange.t
391 test-obsolete-checkheads.t
391 test-obsolete-checkheads.t
392 test-obsolete-distributed.t
392 test-obsolete-distributed.t
393 test-obsolete-divergent.t
393 test-obsolete-divergent.t
394 test-obsolete-tag-cache.t
394 test-obsolete-tag-cache.t
395 test-obsolete.t
395 test-obsolete.t
396 test-origbackup-conflict.t
396 test-pager-legacy.t
397 test-pager-legacy.t
397 test-pager.t
398 test-pager.t
398 test-parents.t
399 test-parents.t
399 test-parseindex2.py
400 test-parseindex2.py
400 test-patch-offset.t
401 test-patch-offset.t
401 test-patch.t
402 test-patch.t
402 test-patchbomb-bookmark.t
403 test-patchbomb-bookmark.t
403 test-patchbomb-tls.t
404 test-patchbomb-tls.t
404 test-patchbomb.t
405 test-patchbomb.t
406 test-pathconflicts-basic.t
405 test-pathconflicts-merge.t
407 test-pathconflicts-merge.t
406 test-pathconflicts-update.t
408 test-pathconflicts-update.t
407 test-pathencode.py
409 test-pathencode.py
408 test-pending.t
410 test-pending.t
409 test-permissions.t
411 test-permissions.t
410 test-phases-exchange.t
412 test-phases-exchange.t
411 test-phases.t
413 test-phases.t
412 test-progress.t
414 test-progress.t
413 test-pull-branch.t
415 test-pull-branch.t
414 test-pull-http.t
416 test-pull-http.t
415 test-pull-permission.t
417 test-pull-permission.t
416 test-pull-pull-corruption.t
418 test-pull-pull-corruption.t
417 test-pull-r.t
419 test-pull-r.t
418 test-pull-update.t
420 test-pull-update.t
419 test-pull.t
421 test-pull.t
420 test-purge.t
422 test-purge.t
421 test-push-cgi.t
423 test-push-cgi.t
422 test-push-checkheads-partial-C1.t
424 test-push-checkheads-partial-C1.t
423 test-push-checkheads-partial-C2.t
425 test-push-checkheads-partial-C2.t
424 test-push-checkheads-partial-C3.t
426 test-push-checkheads-partial-C3.t
425 test-push-checkheads-partial-C4.t
427 test-push-checkheads-partial-C4.t
426 test-push-checkheads-pruned-B1.t
428 test-push-checkheads-pruned-B1.t
427 test-push-checkheads-pruned-B2.t
429 test-push-checkheads-pruned-B2.t
428 test-push-checkheads-pruned-B3.t
430 test-push-checkheads-pruned-B3.t
429 test-push-checkheads-pruned-B4.t
431 test-push-checkheads-pruned-B4.t
430 test-push-checkheads-pruned-B5.t
432 test-push-checkheads-pruned-B5.t
431 test-push-checkheads-pruned-B6.t
433 test-push-checkheads-pruned-B6.t
432 test-push-checkheads-pruned-B7.t
434 test-push-checkheads-pruned-B7.t
433 test-push-checkheads-pruned-B8.t
435 test-push-checkheads-pruned-B8.t
434 test-push-checkheads-superceed-A1.t
436 test-push-checkheads-superceed-A1.t
435 test-push-checkheads-superceed-A2.t
437 test-push-checkheads-superceed-A2.t
436 test-push-checkheads-superceed-A3.t
438 test-push-checkheads-superceed-A3.t
437 test-push-checkheads-superceed-A4.t
439 test-push-checkheads-superceed-A4.t
438 test-push-checkheads-superceed-A5.t
440 test-push-checkheads-superceed-A5.t
439 test-push-checkheads-superceed-A6.t
441 test-push-checkheads-superceed-A6.t
440 test-push-checkheads-superceed-A7.t
442 test-push-checkheads-superceed-A7.t
441 test-push-checkheads-superceed-A8.t
443 test-push-checkheads-superceed-A8.t
442 test-push-checkheads-unpushed-D1.t
444 test-push-checkheads-unpushed-D1.t
443 test-push-checkheads-unpushed-D2.t
445 test-push-checkheads-unpushed-D2.t
444 test-push-checkheads-unpushed-D3.t
446 test-push-checkheads-unpushed-D3.t
445 test-push-checkheads-unpushed-D4.t
447 test-push-checkheads-unpushed-D4.t
446 test-push-checkheads-unpushed-D5.t
448 test-push-checkheads-unpushed-D5.t
447 test-push-checkheads-unpushed-D6.t
449 test-push-checkheads-unpushed-D6.t
448 test-push-checkheads-unpushed-D7.t
450 test-push-checkheads-unpushed-D7.t
449 test-push-http.t
451 test-push-http.t
450 test-push-warn.t
452 test-push-warn.t
451 test-push.t
453 test-push.t
452 test-pushvars.t
454 test-pushvars.t
453 test-qrecord.t
455 test-qrecord.t
454 test-rebase-abort.t
456 test-rebase-abort.t
455 test-rebase-backup.t
457 test-rebase-backup.t
456 test-rebase-base-flag.t
458 test-rebase-base-flag.t
457 test-rebase-bookmarks.t
459 test-rebase-bookmarks.t
458 test-rebase-brute-force.t
460 test-rebase-brute-force.t
459 test-rebase-cache.t
461 test-rebase-cache.t
460 test-rebase-check-restore.t
462 test-rebase-check-restore.t
461 test-rebase-collapse.t
463 test-rebase-collapse.t
462 test-rebase-conflicts.t
464 test-rebase-conflicts.t
463 test-rebase-dest.t
465 test-rebase-dest.t
464 test-rebase-detach.t
466 test-rebase-detach.t
465 test-rebase-emptycommit.t
467 test-rebase-emptycommit.t
466 test-rebase-inmemory.t
468 test-rebase-inmemory.t
467 test-rebase-interruptions.t
469 test-rebase-interruptions.t
468 test-rebase-issue-noparam-single-rev.t
470 test-rebase-issue-noparam-single-rev.t
469 test-rebase-legacy.t
471 test-rebase-legacy.t
470 test-rebase-mq-skip.t
472 test-rebase-mq-skip.t
471 test-rebase-mq.t
473 test-rebase-mq.t
472 test-rebase-named-branches.t
474 test-rebase-named-branches.t
473 test-rebase-newancestor.t
475 test-rebase-newancestor.t
474 test-rebase-obsolete.t
476 test-rebase-obsolete.t
475 test-rebase-parameters.t
477 test-rebase-parameters.t
476 test-rebase-partial.t
478 test-rebase-partial.t
477 test-rebase-pull.t
479 test-rebase-pull.t
478 test-rebase-rename.t
480 test-rebase-rename.t
479 test-rebase-scenario-global.t
481 test-rebase-scenario-global.t
480 test-rebase-templates.t
482 test-rebase-templates.t
481 test-rebase-transaction.t
483 test-rebase-transaction.t
482 test-rebuildstate.t
484 test-rebuildstate.t
483 test-record.t
485 test-record.t
484 test-relink.t
486 test-relink.t
485 test-remove.t
487 test-remove.t
486 test-removeemptydirs.t
488 test-removeemptydirs.t
487 test-rename-after-merge.t
489 test-rename-after-merge.t
488 test-rename-dir-merge.t
490 test-rename-dir-merge.t
489 test-rename-merge1.t
491 test-rename-merge1.t
490 test-rename-merge2.t
492 test-rename-merge2.t
491 test-rename.t
493 test-rename.t
492 test-repair-strip.t
494 test-repair-strip.t
493 test-repo-compengines.t
495 test-repo-compengines.t
494 test-requires.t
496 test-requires.t
495 test-resolve.t
497 test-resolve.t
496 test-revert-flags.t
498 test-revert-flags.t
497 test-revert-interactive.t
499 test-revert-interactive.t
498 test-revert-unknown.t
500 test-revert-unknown.t
499 test-revert.t
501 test-revert.t
500 test-revisions.t
502 test-revisions.t
501 test-revlog-ancestry.py
503 test-revlog-ancestry.py
502 test-revlog-group-emptyiter.t
504 test-revlog-group-emptyiter.t
503 test-revlog-mmapindex.t
505 test-revlog-mmapindex.t
504 test-revlog-packentry.t
506 test-revlog-packentry.t
505 test-revlog-raw.py
507 test-revlog-raw.py
506 test-revlog-v2.t
508 test-revlog-v2.t
507 test-revset-dirstate-parents.t
509 test-revset-dirstate-parents.t
508 test-revset-legacy-lookup.t
510 test-revset-legacy-lookup.t
509 test-revset-outgoing.t
511 test-revset-outgoing.t
510 test-rollback.t
512 test-rollback.t
511 test-run-tests.py
513 test-run-tests.py
512 test-run-tests.t
514 test-run-tests.t
513 test-schemes.t
515 test-schemes.t
514 test-serve.t
516 test-serve.t
515 test-setdiscovery.t
517 test-setdiscovery.t
516 test-share.t
518 test-share.t
517 test-shelve.t
519 test-shelve.t
518 test-show-stack.t
520 test-show-stack.t
519 test-show-work.t
521 test-show-work.t
520 test-show.t
522 test-show.t
521 test-simple-update.t
523 test-simple-update.t
522 test-simplekeyvaluefile.py
524 test-simplekeyvaluefile.py
523 test-simplemerge.py
525 test-simplemerge.py
524 test-single-head.t
526 test-single-head.t
525 test-sparse-clear.t
527 test-sparse-clear.t
526 test-sparse-clone.t
528 test-sparse-clone.t
527 test-sparse-import.t
529 test-sparse-import.t
528 test-sparse-merges.t
530 test-sparse-merges.t
529 test-sparse-profiles.t
531 test-sparse-profiles.t
530 test-sparse-requirement.t
532 test-sparse-requirement.t
531 test-sparse-verbose-json.t
533 test-sparse-verbose-json.t
532 test-sparse.t
534 test-sparse.t
533 test-split.t
535 test-split.t
534 test-ssh-bundle1.t
536 test-ssh-bundle1.t
535 test-ssh-clone-r.t
537 test-ssh-clone-r.t
536 test-ssh-proto-unbundle.t
538 test-ssh-proto-unbundle.t
537 test-ssh-proto.t
539 test-ssh-proto.t
538 test-ssh-repoerror.t
540 test-ssh-repoerror.t
539 test-ssh.t
541 test-ssh.t
540 test-sshserver.py
542 test-sshserver.py
541 test-stack.t
543 test-stack.t
542 test-status-color.t
544 test-status-color.t
543 test-status-inprocess.py
545 test-status-inprocess.py
544 test-status-rev.t
546 test-status-rev.t
545 test-status-terse.t
547 test-status-terse.t
546 test-storage.py
548 test-storage.py
547 test-stream-bundle-v2.t
549 test-stream-bundle-v2.t
548 test-strict.t
550 test-strict.t
549 test-strip-cross.t
551 test-strip-cross.t
550 test-strip.t
552 test-strip.t
551 test-subrepo-deep-nested-change.t
553 test-subrepo-deep-nested-change.t
552 test-subrepo-missing.t
554 test-subrepo-missing.t
553 test-subrepo-paths.t
555 test-subrepo-paths.t
554 test-subrepo-recursion.t
556 test-subrepo-recursion.t
555 test-subrepo-relative-path.t
557 test-subrepo-relative-path.t
556 test-subrepo.t
558 test-subrepo.t
557 test-symlink-os-yes-fs-no.py
559 test-symlink-os-yes-fs-no.py
558 test-symlink-placeholder.t
560 test-symlink-placeholder.t
559 test-symlinks.t
561 test-symlinks.t
560 test-tag.t
562 test-tag.t
561 test-tags.t
563 test-tags.t
562 test-template-basic.t
564 test-template-basic.t
563 test-template-functions.t
565 test-template-functions.t
564 test-template-keywords.t
566 test-template-keywords.t
565 test-template-map.t
567 test-template-map.t
566 test-transplant.t
568 test-transplant.t
567 test-treemanifest.t
569 test-treemanifest.t
568 test-ui-color.py
570 test-ui-color.py
569 test-ui-config.py
571 test-ui-config.py
570 test-ui-verbosity.py
572 test-ui-verbosity.py
571 test-unamend.t
573 test-unamend.t
572 test-unbundlehash.t
574 test-unbundlehash.t
573 test-uncommit.t
575 test-uncommit.t
574 test-unified-test.t
576 test-unified-test.t
575 test-unionrepo.t
577 test-unionrepo.t
576 test-unrelated-pull.t
578 test-unrelated-pull.t
577 test-up-local-change.t
579 test-up-local-change.t
578 test-update-branches.t
580 test-update-branches.t
579 test-update-dest.t
581 test-update-dest.t
580 test-update-issue1456.t
582 test-update-issue1456.t
581 test-update-names.t
583 test-update-names.t
582 test-update-reverse.t
584 test-update-reverse.t
583 test-upgrade-repo.t
585 test-upgrade-repo.t
584 test-url-download.t
586 test-url-download.t
585 test-url-rev.t
587 test-url-rev.t
586 test-url.py
588 test-url.py
587 test-username-newline.t
589 test-username-newline.t
588 test-util.py
590 test-util.py
589 test-verify.t
591 test-verify.t
590 test-walk.t
592 test-walk.t
591 test-walkrepo.py
593 test-walkrepo.py
592 test-websub.t
594 test-websub.t
593 test-win32text.t
595 test-win32text.t
594 test-wireproto-clientreactor.py
596 test-wireproto-clientreactor.py
595 test-wireproto-command-branchmap.t
597 test-wireproto-command-branchmap.t
596 test-wireproto-command-changesetdata.t
598 test-wireproto-command-changesetdata.t
597 test-wireproto-command-filedata.t
599 test-wireproto-command-filedata.t
598 test-wireproto-command-filesdata.t
600 test-wireproto-command-filesdata.t
599 test-wireproto-command-heads.t
601 test-wireproto-command-heads.t
600 test-wireproto-command-listkeys.t
602 test-wireproto-command-listkeys.t
601 test-wireproto-command-lookup.t
603 test-wireproto-command-lookup.t
602 test-wireproto-command-manifestdata.t
604 test-wireproto-command-manifestdata.t
603 test-wireproto-command-pushkey.t
605 test-wireproto-command-pushkey.t
604 test-wireproto-framing.py
606 test-wireproto-framing.py
605 test-wireproto-serverreactor.py
607 test-wireproto-serverreactor.py
606 test-wireproto.py
608 test-wireproto.py
607 test-wsgirequest.py
609 test-wsgirequest.py
608 test-xdg.t
610 test-xdg.t
@@ -1,136 +1,136 b''
1 Set up repo
1 Set up repo
2
2
3 $ cat << EOF >> $HGRCPATH
3 $ cat << EOF >> $HGRCPATH
4 > [ui]
4 > [ui]
5 > origbackuppath=.hg/origbackups
5 > origbackuppath=.hg/origbackups
6 > [merge]
6 > [merge]
7 > checkunknown=warn
7 > checkunknown=warn
8 > EOF
8 > EOF
9 $ hg init repo
9 $ hg init repo
10 $ cd repo
10 $ cd repo
11 $ echo base > base
11 $ echo base > base
12 $ hg add base
12 $ hg add base
13 $ hg commit -m "base"
13 $ hg commit -m "base"
14
14
15 Make a dir named b that contains a file, and a file named d
15 Make a dir named b that contains a file, and a file named d
16
16
17 $ mkdir -p b
17 $ mkdir -p b
18 $ echo c1 > b/c
18 $ echo c1 > b/c
19 $ echo d1 > d
19 $ echo d1 > d
20 $ hg add b/c d
20 $ hg add b/c d
21 $ hg commit -m "c1"
21 $ hg commit -m "c1"
22 $ hg bookmark c1
22 $ hg bookmark c1
23
23
24 Peform an update that causes b/c to be backed up
24 Peform an update that causes b/c to be backed up
25
25
26 $ hg up -q 0
26 $ hg up -q 0
27 $ mkdir -p b
27 $ mkdir -p b
28 $ echo c2 > b/c
28 $ echo c2 > b/c
29 $ hg up --verbose c1
29 $ hg up --verbose c1
30 resolving manifests
30 resolving manifests
31 b/c: replacing untracked file
31 b/c: replacing untracked file
32 getting b/c
32 getting b/c
33 creating directory: $TESTTMP/repo/.hg/origbackups/b
33 creating directory: $TESTTMP/repo/.hg/origbackups/b
34 getting d
34 getting d
35 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
35 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
36 (activating bookmark c1)
36 (activating bookmark c1)
37 $ test -f .hg/origbackups/b/c
37 $ test -f .hg/origbackups/b/c
38
38
39 Make files named b and d
39 Make files named b and d
40
40
41 $ hg up -q 0
41 $ hg up -q 0
42 $ echo b1 > b
42 $ echo b1 > b
43 $ echo d2 > d
43 $ echo d2 > d
44 $ hg add b d
44 $ hg add b d
45 $ hg commit -m b1
45 $ hg commit -m b1
46 created new head
46 created new head
47 $ hg bookmark b1
47 $ hg bookmark b1
48
48
49 Perform an update that causes b to be backed up - it should replace the backup b dir
49 Perform an update that causes b to be backed up - it should replace the backup b dir
50
50
51 $ hg up -q 0
51 $ hg up -q 0
52 $ echo b2 > b
52 $ echo b2 > b
53 $ hg up --verbose b1
53 $ hg up --verbose b1
54 resolving manifests
54 resolving manifests
55 b: replacing untracked file
55 b: replacing untracked file
56 getting b
56 getting b
57 removing conflicting directory: $TESTTMP/repo/.hg/origbackups/b
57 removing conflicting directory: $TESTTMP/repo/.hg/origbackups/b
58 getting d
58 getting d
59 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
59 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
60 (activating bookmark b1)
60 (activating bookmark b1)
61 $ test -f .hg/origbackups/b
61 $ test -f .hg/origbackups/b
62
62
63 Perform an update the causes b/c to be backed up again - it should replace the backup b file
63 Perform an update the causes b/c to be backed up again - it should replace the backup b file
64
64
65 $ hg up -q 0
65 $ hg up -q 0
66 $ mkdir b
66 $ mkdir b
67 $ echo c3 > b/c
67 $ echo c3 > b/c
68 $ hg up --verbose c1
68 $ hg up --verbose c1
69 resolving manifests
69 resolving manifests
70 b/c: replacing untracked file
70 b/c: replacing untracked file
71 getting b/c
71 getting b/c
72 creating directory: $TESTTMP/repo/.hg/origbackups/b
72 creating directory: $TESTTMP/repo/.hg/origbackups/b
73 removing conflicting file: $TESTTMP/repo/.hg/origbackups/b
73 removing conflicting file: $TESTTMP/repo/.hg/origbackups/b
74 getting d
74 getting d
75 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
75 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
76 (activating bookmark c1)
76 (activating bookmark c1)
77 $ test -d .hg/origbackups/b
77 $ test -d .hg/origbackups/b
78
78
79 Cause two symlinks to be backed up that points to a valid location from the backup dir
79 Cause two symlinks to be backed up that points to a valid location from the backup dir
80
80
81 $ hg up -q 0
81 $ hg up -q 0
82 $ mkdir ../sym-link-target
82 $ mkdir ../sym-link-target
83 #if symlink
83 #if symlink
84 $ ln -s ../../../sym-link-target b
84 $ ln -s ../../../sym-link-target b
85 $ ln -s ../../../sym-link-target d
85 $ ln -s ../../../sym-link-target d
86 #else
86 #else
87 $ touch b d
87 $ touch b d
88 #endif
88 #endif
89 $ hg up b1
89 $ hg up b1
90 b: replacing untracked file
90 b: replacing untracked file
91 d: replacing untracked file
91 d: replacing untracked file
92 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
92 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
93 (activating bookmark b1)
93 (activating bookmark b1)
94 #if symlink
94 #if symlink
95 $ readlink.py .hg/origbackups/b
95 $ readlink.py .hg/origbackups/b
96 .hg/origbackups/b -> ../../../sym-link-target
96 .hg/origbackups/b -> ../../../sym-link-target
97 #endif
97 #endif
98
98
99 Perform an update that causes b/c and d to be backed up again - b/c should not go into the target dir
99 Perform an update that causes b/c and d to be backed up again - b/c should not go into the target dir
100
100
101 $ hg up -q 0
101 $ hg up -q 0
102 $ mkdir b
102 $ mkdir b
103 $ echo c4 > b/c
103 $ echo c4 > b/c
104 $ echo d3 > d
104 $ echo d3 > d
105 $ hg up --verbose c1
105 $ hg up --verbose c1
106 resolving manifests
106 resolving manifests
107 b/c: replacing untracked file
107 b/c: replacing untracked file
108 d: replacing untracked file
108 d: replacing untracked file
109 getting b/c
109 getting b/c
110 creating directory: $TESTTMP/repo/.hg/origbackups/b
110 creating directory: $TESTTMP/repo/.hg/origbackups/b
111 removing conflicting file: $TESTTMP/repo/.hg/origbackups/b
111 removing conflicting file: $TESTTMP/repo/.hg/origbackups/b
112 getting d
112 getting d
113 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
113 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
114 (activating bookmark c1)
114 (activating bookmark c1)
115 $ cat .hg/origbackups/b/c
115 $ cat .hg/origbackups/b/c
116 c4
116 c4
117 $ cat .hg/origbackups/d
117 $ cat .hg/origbackups/d
118 d3
118 d3
119 $ ls ../sym-link-target
119 $ ls ../sym-link-target
120
120
121 Incorrectly configure origbackuppath to be under a file
121 Incorrectly configure origbackuppath to be under a file
122
122
123 $ echo data > .hg/badorigbackups
123 $ echo data > .hg/badorigbackups
124 $ hg up -q 0
124 $ hg up -q 0
125 $ mkdir b
125 $ mkdir b
126 $ echo c5 > b/c
126 $ echo c5 > b/c
127 $ hg up --verbose c1 --config ui.origbackuppath=.hg/badorigbackups
127 $ hg up --verbose c1 --config ui.origbackuppath=.hg/badorigbackups
128 resolving manifests
128 resolving manifests
129 b/c: replacing untracked file
129 b/c: replacing untracked file
130 getting b/c
130 getting b/c
131 creating directory: $TESTTMP/repo/.hg/badorigbackups/b
131 creating directory: $TESTTMP/repo/.hg/badorigbackups/b
132 abort: $ENOTDIR$: '$TESTTMP/repo/.hg/badorigbackups/b'
132 abort: $ENOTDIR$: *$TESTTMP/repo/.hg/badorigbackups/b* (glob)
133 [255]
133 [255]
134 $ cat .hg/badorigbackups
134 $ cat .hg/badorigbackups
135 data
135 data
136
136
@@ -1,106 +1,106 b''
1 Path conflict checking is currently disabled by default because of issue5716.
1 Path conflict checking is currently disabled by default because of issue5716.
2 Turn it on for this test.
2 Turn it on for this test.
3
3
4 $ cat >> $HGRCPATH << EOF
4 $ cat >> $HGRCPATH << EOF
5 > [experimental]
5 > [experimental]
6 > merge.checkpathconflicts=True
6 > merge.checkpathconflicts=True
7 > EOF
7 > EOF
8
8
9 $ hg init repo
9 $ hg init repo
10 $ cd repo
10 $ cd repo
11 $ echo base > base
11 $ echo base > base
12 $ hg add base
12 $ hg add base
13 $ hg commit -m "base"
13 $ hg commit -m "base"
14 $ hg bookmark -i base
14 $ hg bookmark -i base
15 $ echo 1 > a
15 $ echo 1 > a
16 $ hg add a
16 $ hg add a
17 $ hg commit -m "file"
17 $ hg commit -m "file"
18 $ hg bookmark -i file
18 $ hg bookmark -i file
19 $ echo 2 > a
19 $ echo 2 > a
20 $ hg commit -m "file2"
20 $ hg commit -m "file2"
21 $ hg bookmark -i file2
21 $ hg bookmark -i file2
22 $ hg up -q 0
22 $ hg up -q 0
23 $ mkdir a
23 $ mkdir a
24 $ echo 2 > a/b
24 $ echo 2 > a/b
25 $ hg add a/b
25 $ hg add a/b
26 $ hg commit -m "dir"
26 $ hg commit -m "dir"
27 created new head
27 created new head
28 $ hg bookmark -i dir
28 $ hg bookmark -i dir
29
29
30 Basic merge - local file conflicts with remote directory
30 Basic merge - local file conflicts with remote directory
31
31
32 $ hg up -q file
32 $ hg up -q file
33 $ hg bookmark -i
33 $ hg bookmark -i
34 $ hg merge --verbose dir
34 $ hg merge --verbose dir
35 resolving manifests
35 resolving manifests
36 a: path conflict - a file or link has the same name as a directory
36 a: path conflict - a file or link has the same name as a directory
37 the local file has been renamed to a~853701544ac3
37 the local file has been renamed to a~853701544ac3
38 resolve manually then use 'hg resolve --mark a'
38 resolve manually then use 'hg resolve --mark a'
39 moving a to a~853701544ac3
39 moving a to a~853701544ac3
40 getting a/b
40 getting a/b
41 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
41 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
42 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
42 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
43 [1]
43 [1]
44 $ hg update --clean .
44 $ hg update --clean .
45 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
45 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
46 $ rm a~853701544ac3
46 $ rm a~853701544ac3
47
47
48 Basic update - local directory conflicts with remote file
48 Basic update - local directory conflicts with remote file
49
49
50 $ hg up -q 0
50 $ hg up -q 0
51 $ mkdir a
51 $ mkdir a
52 $ echo 3 > a/b
52 $ echo 3 > a/b
53 $ hg up file
53 $ hg up file
54 a: untracked directory conflicts with file
54 a: untracked directory conflicts with file
55 abort: untracked files in working directory differ from files in requested revision
55 abort: untracked files in working directory differ from files in requested revision
56 [255]
56 [255]
57 $ hg up --clean file
57 $ hg up --clean file
58 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
58 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
59 (activating bookmark file)
59 (activating bookmark file)
60
60
61 Repo state is ok
61 Repo state is ok
62
62
63 $ hg sum
63 $ hg sum
64 parent: 1:853701544ac3
64 parent: 1:853701544ac3
65 file
65 file
66 branch: default
66 branch: default
67 bookmarks: *file
67 bookmarks: *file
68 commit: (clean)
68 commit: (clean)
69 update: 2 new changesets (update)
69 update: 2 new changesets (update)
70 phases: 4 draft
70 phases: 4 draft
71
71
72 Basic update - untracked file conflicts with remote directory
72 Basic update - untracked file conflicts with remote directory
73
73
74 $ hg up -q 0
74 $ hg up -q 0
75 $ echo untracked > a
75 $ echo untracked > a
76 $ hg up --config merge.checkunknown=warn dir
76 $ hg up --config merge.checkunknown=warn dir
77 a: replacing untracked file
77 a: replacing untracked file
78 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
78 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
79 (activating bookmark dir)
79 (activating bookmark dir)
80 $ cat a.orig
80 $ cat a.orig
81 untracked
81 untracked
82 $ rm -f a.orig
82 $ rm -f a.orig
83
83
84 Basic clean update - local directory conflicts with changed remote file
84 Basic clean update - local directory conflicts with changed remote file
85
85
86 $ hg up -q file
86 $ hg up -q file
87 $ rm a
87 $ rm a
88 $ mkdir a
88 $ mkdir a
89 $ echo 4 > a/b
89 $ echo 4 > a/b
90 $ hg up file2
90 $ hg up file2
91 abort: *: '$TESTTMP/repo/a' (glob)
91 abort: *: *$TESTTMP/repo/a* (glob)
92 [255]
92 [255]
93 $ hg up --clean file2
93 $ hg up --clean file2
94 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
94 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
95 (activating bookmark file2)
95 (activating bookmark file2)
96
96
97 Repo state is ok
97 Repo state is ok
98
98
99 $ hg sum
99 $ hg sum
100 parent: 2:f64e09fac717
100 parent: 2:f64e09fac717
101 file2
101 file2
102 branch: default
102 branch: default
103 bookmarks: *file2
103 bookmarks: *file2
104 commit: (clean)
104 commit: (clean)
105 update: 1 new changesets, 2 branch heads (merge)
105 update: 1 new changesets, 2 branch heads (merge)
106 phases: 4 draft
106 phases: 4 draft
General Comments 0
You need to be logged in to leave comments. Login now