Mercurial Mercurial > mercurial / 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 Matt Mackall <mpm@selenic.com>
Tue, 01 Jun 2010 10:44:03 -0500
branchstable
changeset 11259 24fe2629c6fd
parent 10928 377d879e9d1b
child 12574 77600d697d0e
permissions -rw-r--r--
Merge with i18n
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
10928
377d879e9d1b test-git-import: better testing, check nodeids
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5405
diff changeset 
     3
 
0:ae3ee40d2079
3589
1c9b6f1237e0 test for git empty new files
Brendan Cully <brendan@kublai.com>
parents: 2919
diff changeset 
     4
 
% new empty file
1c9b6f1237e0 test for git empty new files
Brendan Cully <brendan@kublai.com>
parents: 2919
diff changeset 
     5
 
applying patch from stdin
10928
377d879e9d1b test-git-import: better testing, check nodeids
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5405
diff changeset 
     6
 
1:ab199dc869b5
3589
1c9b6f1237e0 test for git empty new files
Brendan Cully <brendan@kublai.com>
parents: 2919
diff changeset 
     7
 
empty
2864
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     8
 
% chmod +x
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     9
 
applying patch from stdin
10928
377d879e9d1b test-git-import: better testing, check nodeids
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5405
diff changeset 
    10
 
2:3a34410f282e
2864
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    11
 
% copy
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    12
 
applying patch from stdin
10928
377d879e9d1b test-git-import: better testing, check nodeids
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5405
diff changeset 
    13
 
3:37bacb7ca14d
2864
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    14
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    15
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    16
 
% rename
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    17
 
applying patch from stdin
10928
377d879e9d1b test-git-import: better testing, check nodeids
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5405
diff changeset 
    18
 
4:47b81a94361d
2864
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    19
 
copyx
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
 
% delete
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    24
 
applying patch from stdin
10928
377d879e9d1b test-git-import: better testing, check nodeids
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5405
diff changeset 
    25
 
5:d9b001d98336
3589
1c9b6f1237e0 test for git empty new files
Brendan Cully <brendan@kublai.com>
parents: 2919
diff changeset 
    26
 
empty
2864
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    27
 
new
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    28
 
rename
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    29
 
% regular diff
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    30
 
applying patch from stdin
10928
377d879e9d1b test-git-import: better testing, check nodeids
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5405
diff changeset 
    31
 
6:ebe901e7576b
2864
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    32
 
% copy and modify
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    33
 
applying patch from stdin
10928
377d879e9d1b test-git-import: better testing, check nodeids
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5405
diff changeset 
    34
 
7:18f368958ecd
2864
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
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    37
 
b
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    38
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    39
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    40
 
% rename and modify
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    41
 
applying patch from stdin
10928
377d879e9d1b test-git-import: better testing, check nodeids
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5405
diff changeset 
    42
 
8:c32b0d7e6f44
2864
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    43
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    44
 
a
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    45
 
b
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    46
 
c
e2b69dbb2daa Tests for git import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    47
 
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 
    48
 
% 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 
    49
 
applying patch from stdin
10928
377d879e9d1b test-git-import: better testing, check nodeids
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5405
diff changeset 
    50
 
9:034a6bf95330
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 
    51
 
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 
    52
 
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 
    53
 
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 
    54
 
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 
    55
 
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 
    56
 
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 
    57
 
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 
    58
 
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 
    59
 












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




    60


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




    61


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




    62


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




    63


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




    64


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




    65


% 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




    66


applying patch from stdin







10928






377d879e9d1b
test-git-import: better testing, check nodeids



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
5405

diff
changeset




    67


11:c39bce63e786







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




    68


foo







5405






8feb33c2d153
Display symlink or executable bit with manifest -v



Patrick Mezard <pmezard@gmail.com>


parents: 
5403

diff
changeset




    69


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




    70


% 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




    71


applying patch from stdin







10928






377d879e9d1b
test-git-import: better testing, check nodeids



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
5405

diff
changeset




    72


12:30b530085242







5405






8feb33c2d153
Display symlink or executable bit with manifest -v



Patrick Mezard <pmezard@gmail.com>


parents: 
5403

diff
changeset




    73


045c85ba38952325e126c70962cc0f9d9077bc67 644   mbinary1












8feb33c2d153
Display symlink or executable bit with manifest -v



Patrick Mezard <pmezard@gmail.com>


parents: 
5403

diff
changeset




    74


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




    75


% filenames with spaces












826659bd8053
git patches: correct handling of filenames with spaces



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


parents: 
4195

diff
changeset




    76


applying patch from stdin







10928






377d879e9d1b
test-git-import: better testing, check nodeids



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
5405

diff
changeset




    77


13:04750ef42fb3







4679






826659bd8053
git patches: correct handling of filenames with spaces



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


parents: 
4195

diff
changeset




    78


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




    79


% 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




    80


applying patch from stdin







10928






377d879e9d1b
test-git-import: better testing, check nodeids



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
5405

diff
changeset




    81


14:c4cd9cdeaa74







5403






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



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


parents: 
4679

diff
changeset




    82


foo














mercurial