Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-git-import.out
author David Soria Parra <dsp@php.net>
Sun, 07 Dec 2008 08:47:02 +0100
changeset 7485 ecfb683675ed
parent 5405 8feb33c2d153
child 10928 377d879e9d1b
permissions -rw-r--r--
Merge bookmarks
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2864
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     1
 
% new file
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     2
 
applying patch from stdin
3589
1c9b6f1237e0 test for git empty new files
Brendan Cully <brendan@kublai.com>
parents: 2919
diff changeset 
     3
 
% new empty file
1c9b6f1237e0 test for git empty new files
Brendan Cully <brendan@kublai.com>
parents: 2919
diff changeset 
     4
 
applying patch from stdin
1c9b6f1237e0 test for git empty new files
Brendan Cully <brendan@kublai.com>
parents: 2919
diff changeset 
     5
 
empty
2864
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     6
 
% chmod +x
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     7
 
applying patch from stdin
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     8
 
% copy
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     9
 
applying patch from stdin
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    10
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    11
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    12
 
% rename
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    13
 
applying patch from stdin
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    14
 
copyx
3589
1c9b6f1237e0 test for git empty new files
Brendan Cully <brendan@kublai.com>
parents: 2919
diff changeset 
    15
 
empty
2864
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    16
 
new
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    17
 
rename
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    18
 
% delete
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    19
 
applying patch from stdin
3589
1c9b6f1237e0 test for git empty new files
Brendan Cully <brendan@kublai.com>
parents: 2919
diff changeset 
    20
 
empty
2864
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    21
 
new
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    22
 
rename
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    23
 
% regular diff
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    24
 
applying patch from stdin
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    25
 
% copy and modify
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    26
 
applying patch from stdin
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    27
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    28
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    29
 
b
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    30
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    31
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    32
 
% rename and modify
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    33
 
applying patch from stdin
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    34
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    35
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    36
 
b
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    37
 
c
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    38
 
a
3701
05c8704a3743 handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3589
diff changeset 
    39
 
% one file renamed multiple times
05c8704a3743 handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3589
diff changeset 
    40
 
applying patch from stdin
05c8704a3743 handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3589
diff changeset 
    41
 
9 rename2 rename3 rename3-2 / rename3 (rename2)rename3-2 (rename2)
05c8704a3743 handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3589
diff changeset 
    42
 
rename3
05c8704a3743 handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3589
diff changeset 
    43
 
rename3-2
05c8704a3743 handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3589
diff changeset 
    44
 
a
05c8704a3743 handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3589
diff changeset 
    45
 
a
05c8704a3743 handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3589
diff changeset 
    46
 
b
05c8704a3743 handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3589
diff changeset 
    47
 
c
05c8704a3743 handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3589
diff changeset 
    48
 
a
05c8704a3743 handle git patches that rename a file to more than one destination
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3589
diff changeset 
    49
 












05c8704a3743
handle git patches that rename a file to more than one destination



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
3589

diff
changeset




    50


a













05c8704a3743
handle git patches that rename a file to more than one destination



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
3589

diff
changeset




    51


a













05c8704a3743
handle git patches that rename a file to more than one destination



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
3589

diff
changeset




    52


b













05c8704a3743
handle git patches that rename a file to more than one destination



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
3589

diff
changeset




    53


c













05c8704a3743
handle git patches that rename a file to more than one destination



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
3589

diff
changeset




    54


a








3716






ab5600428b08
handle files with both git binary patches and copy/rename ops



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
3701

diff
changeset




    55


% binary files and regular patch hunks













ab5600428b08
handle files with both git binary patches and copy/rename ops



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
3701

diff
changeset




    56


applying patch from stdin













ab5600428b08
handle files with both git binary patches and copy/rename ops



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
3701

diff
changeset




    57


foo








5405






8feb33c2d153
Display symlink or executable bit with manifest -v



Patrick Mezard <pmezard@gmail.com>


parents: 
5403

diff
changeset




    58


045c85ba38952325e126c70962cc0f9d9077bc67 644   binary








3717






9e248cfd8b94
handle files with more than one git binary patch



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
3716

diff
changeset




    59


% many binary files













9e248cfd8b94
handle files with more than one git binary patch



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
3716

diff
changeset




    60


applying patch from stdin








5405






8feb33c2d153
Display symlink or executable bit with manifest -v



Patrick Mezard <pmezard@gmail.com>


parents: 
5403

diff
changeset




    61


045c85ba38952325e126c70962cc0f9d9077bc67 644   mbinary1













8feb33c2d153
Display symlink or executable bit with manifest -v



Patrick Mezard <pmezard@gmail.com>


parents: 
5403

diff
changeset




    62


a874b471193996e7cb034bb301cac7bdaf3e3f46 644   mbinary2








4679






826659bd8053
git patches: correct handling of filenames with spaces



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
4195

diff
changeset




    63


% filenames with spaces













826659bd8053
git patches: correct handling of filenames with spaces



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
4195

diff
changeset




    64


applying patch from stdin













826659bd8053
git patches: correct handling of filenames with spaces



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
4195

diff
changeset




    65


foo








5403






477136fa6571
Always copy the necessary files before applying a git patch



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
4679

diff
changeset




    66


% copy then modify the original file













477136fa6571
Always copy the necessary files before applying a git patch



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
4679

diff
changeset




    67


applying patch from stdin













477136fa6571
Always copy the necessary files before applying a git patch



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
4679

diff
changeset




    68


foo















hg-stable