summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Antoine Pelisse <apelisse@gmail.com>2013-10-23 08:44:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-10-23 09:45:53 -0700
commit113626537711e290af46548683e02ae0a2f51b6f (patch)
tree2e31f3953556289e179d019eb1be2b3b5a39bb69 /mergetools
parentgit-merge: document the -S option (diff)
downloadtgif-113626537711e290af46548683e02ae0a2f51b6f.tar.xz
remote-hg: unquote C-style paths when exporting
git-fast-import documentation says that paths can be C-style quoted. Unfortunately, the current remote-hg helper doesn't unquote quoted path and pass them as-is to Mercurial when the commit is created. This results in the following situation: - clone a mercurial repository with git - add a file with space in a directory: `>dir/foo\ bar` - commit that new file, and push the change to mercurial - the mercurial repository now has a new directory named '"dir', which contains a file named 'foo bar"' Use Python str.decode('string-escape') to unquote the string if it starts and ends with ". It has been tested with quotes, spaces, and utf-8 encoded file-names. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions