Mercurial > hg
view tests/test-empty-file.t @ 24924:41cd8171e58f stable
archive: always use portable path component separators with subrepos
The previous behavior when archiving a subrepo 's' on Windows was to internally
name the file under it 's\file', due to the use of vfs.reljoin(). When printing
the file list from the archive on Windows or Linux, the file was named
's\\file'. The archive extracted OK on Windows, but if the archive was brought
to a Linux system, it created a file named 's\file' instead of a directory 's'
containing 'file'.
*.zip format achives seemed not to have the problem, but this was definitely an
issue with *.tgz archives.
Largefiles actually got this right, but a test is added to keep this from
regressing. The subrepo-deep-nested-change.t test was repurposed to archive to
a file, since there are several subsequent tests that archive to a directory.
The output change is losing the filesystem prefix '../archive_lf' and not
listing the directories 'sub1' and 'sub1/sub2'.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 04 May 2015 22:33:29 -0400 |
parents | f2719b387380 |
children |
line wrap: on
line source
$ hg init a $ cd a $ touch empty1 $ hg add empty1 $ hg commit -m 'add empty1' $ touch empty2 $ hg add empty2 $ hg commit -m 'add empty2' $ hg up -C 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ touch empty3 $ hg add empty3 $ hg commit -m 'add empty3' created new head $ hg heads changeset: 2:a1cb177e0d44 tag: tip parent: 0:1e1d9c4e5b64 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: add empty3 changeset: 1:097d2b0e17f6 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: add empty2 $ hg merge 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) Before changeset 05257fd28591, we didn't notice the empty file that came from rev 1: $ hg status M empty2 $ hg commit -m merge $ hg manifest --debug tip b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3 $ cd ..