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-export.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 26 Oct 2006 19:25:45 +0200
changeset 3552 9b52239dc740
parent 3368 751df21dad72
child 3693 454b3a8cdf28
permissions -rw-r--r--
save settings from untrusted config files in a separate configparser This untrusted configparser is a superset of the trusted configparser, so that interpolation still works. Also add an "untrusted" argument to ui.config* to allow querying ui.ucdata. With --debug, we print a warning when we read an untrusted config file, and when we try to access a trusted setting that has one value in the trusted configparser and another in the untrusted configparser.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2907
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     1
 
adding start
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     2
 
adding new
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     3
 
% new file
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     4
 
diff --git a/new b/new
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     5
 
new file mode 100644
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     6
 
--- /dev/null
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     7
 
+++ b/new
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     8
 
@@ -0,0 +1,1 @@
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     9
 
+new
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    10
 
% copy
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    11
 
diff --git a/new b/copy
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    12
 
copy from new
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    13
 
copy to copy
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    14
 
% rename
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    15
 
diff --git a/copy b/rename
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    16
 
rename from copy
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    17
 
rename to rename
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    18
 
% delete
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    19
 
diff --git a/rename b/rename
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    20
 
deleted file mode 100644
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    21
 
--- a/rename
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    22
 
+++ /dev/null
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    23
 
@@ -1,1 +0,0 @@
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    24
 
-new
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    25
 
adding src
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    26
 
% chmod 644
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    27
 
diff --git a/src b/src
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    28
 
old mode 100644
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    29
 
new mode 100755
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    30
 
% rename+mod+chmod
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    31
 
diff --git a/src b/dst
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    32
 
old mode 100755
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    33
 
new mode 100644
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    34
 
rename from src
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    35
 
rename to dst
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    36
 
--- a/dst
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    37
 
+++ b/dst
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    38
 
@@ -3,3 +3,4 @@ 3
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    39
 
 3
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    40
 
 4
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    41
 
 5
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    42
 
+a
3066
035fd2029575 git --diff: fix traceback when getting mode change
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2907
diff changeset 
    43
 
% nonexistent in tip+chmod
035fd2029575 git --diff: fix traceback when getting mode change
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2907
diff changeset 
    44
 
diff --git a/src b/src
035fd2029575 git --diff: fix traceback when getting mode change
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2907
diff changeset 
    45
 
old mode 100644
035fd2029575 git --diff: fix traceback when getting mode change
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2907
diff changeset 
    46
 
new mode 100755
3368
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    47
 
% binary diff
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    48
 
diff --git a/binfile.bin b/binfile.bin
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    49
 
new file mode 100644
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    50
 
index 0000000000000000000000000000000000000000..37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    51
 
GIT binary patch
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    52
 
literal 593
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    53
 
zc$@)I0<QguP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    54
 
z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    55
 
zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    56
 
z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    57
 
zLdY<T=ks|woh-`&01!ej#(xbV1f|pI*=%;d-%F*E*X#ZH`4I%6SS+$EJDE&ct=8po
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    58
 
ziN#{?_j|kD%Cd|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^|Fn^Y?Gdc6<;
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    59
 
zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    60
 
z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W-
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    61
 
zaR2~ECX?B2w+zELozC0s*6Z~|QG^f{3I#<`?)Q7U-JZ|q5W;9Q8i_=pBuSzunx=U;
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    62
 
z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    63
 
zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#=
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    64
 
fQItJW-{SoTm)8|5##k|m00000NkvXXu0mjf{mKw4
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 3066
diff changeset 
    65
 












751df21dad72
Add test for git binary diff support



Brendan Cully <brendan@kublai.com>


parents: 
3066

diff
changeset




    66


% import binary diff












751df21dad72
Add test for git binary diff support



Brendan Cully <brendan@kublai.com>


parents: 
3066

diff
changeset




    67


applying b.diff














mercurial