Mercurial > hg-stable

comparison tests/test-convert-filemap.t @ 17852:1f34b57ca319 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge repeated-slash fix
author Bryan O'Sullivan <bryano@fb.com>
date Mon, 22 Oct 2012 21:54:36 -0700
parents e4da793998bf 7aa7380691b8
children 42455ebbab9f
comparison
equal deleted inserted replaced
17846:f42cf30873dc 17852:1f34b57ca319
224 224
225 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied 225 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied
226 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo 226 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
227 $ hg --cwd foo-copied.repo debugrename copied 227 $ hg --cwd foo-copied.repo debugrename copied
228 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd 228 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
229
230 ensure that the filemap contains duplicated slashes (issue3612)
231
229 $ cat > renames.fmap <<EOF 232 $ cat > renames.fmap <<EOF
230 > include dir 233 > include dir
231 > exclude dir/file2 234 > exclude dir/file2
232 > rename dir dir2//../dir2/ 235 > rename dir dir2//dir3
233 > include foo 236 > include foo
234 > include copied 237 > include copied
235 > rename foo foo2/ 238 > rename foo foo2/
236 > rename copied ./copied2 239 > rename copied ./copied2
237 > exclude dir/subdir 240 > exclude dir/subdir
253 | 256 |
254 o 2 "2: change foo" files: foo2 257 o 2 "2: change foo" files: foo2
255 | 258 |
256 o 1 "1: add bar quux; copy foo to copied" files: copied2 259 o 1 "1: add bar quux; copy foo to copied" files: copied2
257 | 260 |
258 o 0 "0: add foo baz dir/" files: dir2/file dir2/subdir/file3 foo2 261 o 0 "0: add foo baz dir/" files: dir2/dir3/file dir2/dir3/subdir/file3 foo2
259 262
263 $ hg -R renames.repo verify
264 checking changesets
265 checking manifests
266 crosschecking files in changesets and manifests
267 checking files
268 4 files, 5 changesets, 7 total revisions
269
260 $ hg -R renames.repo manifest --debug 270 $ hg -R renames.repo manifest --debug
261 d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644 copied2 271 d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644 copied2
262 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/file 272 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/dir3/file
263 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir2/subdir/file3 273 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir2/dir3/subdir/file3
264 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2 274 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2
265 $ hg --cwd renames.repo debugrename copied2 275 $ hg --cwd renames.repo debugrename copied2
266 copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd 276 copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd
267 277
268 copied: 278 copied: