##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

convert/bzr: make it work with filemaps (issue1631)...
convert/bzr: make it work with filemaps (issue1631) The bzr converter maintains a child -> parents mapping and drop entries whenever a child is read. It does not work with filemaps, getchangedfiles() may be called more than once when filtered files belong to merge revisions. getchanges() still works that way but it is not clear whether a similar issue can arise when interacting with merges.
Patrick Mezard - - Load All Authors

File last commit:

r5405:8feb33c2 default
r8165:78658990 default
Show More
test-git-import.out
68 lines | 989 B | text/plain | TextLexer
/ tests / test-git-import.out
History | Source | Raw |Copy content |Copy permalink
Brendan Cully
Tests for git import
 r2864 % new file
applying patch from stdin
Brendan Cully
test for git empty new files
 r3589 % new empty file
applying patch from stdin
empty
Brendan Cully
Tests for git import
 r2864 % chmod +x
applying patch from stdin
% copy
applying patch from stdin
a
a
% rename
applying patch from stdin
copyx
Brendan Cully
test for git empty new files
 r3589 empty
Brendan Cully
Tests for git import
 r2864 new
rename
% delete
applying patch from stdin
Brendan Cully
test for git empty new files
 r3589 empty
Brendan Cully
Tests for git import
 r2864 new
rename
% regular diff
applying patch from stdin
% copy and modify
applying patch from stdin
a
a
b
a
a
% rename and modify
applying patch from stdin
a
a
b
c
a
Alexis S. L. Carvalho
handle git patches that rename a file to more than one destination
 r3701 % one file renamed multiple times
applying patch from stdin
9 rename2 rename3 rename3-2 / rename3 (rename2)rename3-2 (rename2)
rename3
rename3-2
a
a
b
c
a
a
a
b
c
a
Alexis S. L. Carvalho
handle files with both git binary patches and copy/rename ops
 r3716 % binary files and regular patch hunks
applying patch from stdin
foo
Patrick Mezard
Display symlink or executable bit with manifest -v...
 r5405 045c85ba38952325e126c70962cc0f9d9077bc67 644 binary
Alexis S. L. Carvalho
handle files with more than one git binary patch
 r3717 % many binary files
applying patch from stdin
Patrick Mezard
Display symlink or executable bit with manifest -v...
 r5405 045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1
a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2
Alexis S. L. Carvalho
git patches: correct handling of filenames with spaces...
 r4679 % filenames with spaces
applying patch from stdin
foo
Alexis S. L. Carvalho
Always copy the necessary files before applying a git patch...
 r5403 % copy then modify the original file
applying patch from stdin
foo