Mercurial Mercurial > hg / 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-diff-upgrade.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 05 Apr 2010 20:35:47 +0200
changeset 10839 31e29566f3b5
parent 10189 e451e599fbcf
child 12575 9b3913baba0c
permissions -rw-r--r--
merge with stable
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10189
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     1
 
% make a combination of new, changed and deleted file
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     2
 
adding binary
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     3
 
adding exec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     4
 
adding regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     5
 
adding rmbinary
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     6
 
adding rmempty
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     7
 
adding rmexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     8
 
adding rmregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     9
 
adding setexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    10
 
adding unsetexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    11
 
adding newbinary
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    12
 
adding newempty
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    13
 
adding newexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    14
 
adding newregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    15
 
removing rmbinary
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    16
 
removing rmempty
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    17
 
removing rmexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    18
 
removing rmregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    19
 
% git=no: regular diff for all files
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    20
 
diff -r b3f053cd7c7f binary
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    21
 
Binary file binary has changed
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    22
 
diff -r b3f053cd7c7f exec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    23
 
--- a/exec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    24
 
+++ b/exec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    25
 
@@ -1,1 +1,2 @@
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    26
 
 exec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    27
 
+exec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    28
 
diff -r b3f053cd7c7f newbinary
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    29
 
Binary file newbinary has changed
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    30
 
diff -r b3f053cd7c7f newexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    31
 
--- /dev/null
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    32
 
+++ b/newexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    33
 
@@ -0,0 +1,1 @@
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    34
 
+newexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    35
 
diff -r b3f053cd7c7f newregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    36
 
--- /dev/null
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    37
 
+++ b/newregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    38
 
@@ -0,0 +1,1 @@
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    39
 
+newregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    40
 
diff -r b3f053cd7c7f regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    41
 
--- a/regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    42
 
+++ b/regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    43
 
@@ -1,1 +1,2 @@
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    44
 
 regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    45
 
+regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    46
 
diff -r b3f053cd7c7f rmbinary
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    47
 
Binary file rmbinary has changed
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    48
 
diff -r b3f053cd7c7f rmexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    49
 
--- a/rmexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    50
 
+++ /dev/null
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    51
 
@@ -1,1 +0,0 @@
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    52
 
-rmexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    53
 
diff -r b3f053cd7c7f rmregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    54
 
--- a/rmregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    55
 
+++ /dev/null
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    56
 
@@ -1,1 +0,0 @@
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    57
 
-rmregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    58
 
% git=no: git diff for single regular file
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    59
 
diff --git a/regular b/regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    60
 
--- a/regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    61
 
+++ b/regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    62
 
@@ -1,1 +1,2 @@
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    63
 
 regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    64
 
+regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    65
 
% git=auto: regular diff for regular files and removals
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    66
 
diff -r b3f053cd7c7f newregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    67
 
--- /dev/null
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    68
 
+++ b/newregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    69
 
@@ -0,0 +1,1 @@
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    70
 
+newregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    71
 
diff -r b3f053cd7c7f regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    72
 
--- a/regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    73
 
+++ b/regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    74
 
@@ -1,1 +1,2 @@
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    75
 
 regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    76
 
+regular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    77
 
diff -r b3f053cd7c7f rmbinary
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    78
 
Binary file rmbinary has changed
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    79
 
diff -r b3f053cd7c7f rmexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    80
 
--- a/rmexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    81
 
+++ /dev/null
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    82
 
@@ -1,1 +0,0 @@
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    83
 
-rmexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    84
 
diff -r b3f053cd7c7f rmregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    85
 
--- a/rmregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    86
 
+++ /dev/null
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    87
 
@@ -1,1 +0,0 @@
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    88
 
-rmregular
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    89
 
% git=auto: git diff for exec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    90
 
diff -r b3f053cd7c7f exec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    91
 
--- a/exec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    92
 
+++ b/exec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    93
 
@@ -1,1 +1,2 @@
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    94
 
 exec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    95
 
+exec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    96
 
% git=auto: git diff for newexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    97
 
diff --git a/newexec b/newexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    98
 
new file mode 100755
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    99
 
--- /dev/null
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   100
 
+++ b/newexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   101
 
@@ -0,0 +1,1 @@
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   102
 
+newexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   103
 
% git=auto: git diff for setexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   104
 
diff --git a/setexec b/setexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   105
 
old mode 100644
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   106
 
new mode 100755
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   107
 
% git=auto: git diff for unsetexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   108
 
diff --git a/unsetexec b/unsetexec
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   109
 
old mode 100755
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   110
 
new mode 100644
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   111
 
% git=auto: git diff for binary
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   112
 
diff --git a/binary b/binary
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   113
 
index a9128c283485202893f5af379dd9beccb6e79486..09f370e38f498a462e1ca0faa724559b6630c04f
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   114
 
GIT binary patch
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   115
 
literal 2
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   116
 
Jc${Nk0000200961
e451e599fbcf patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   117
 












e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   118


% git=auto: git diff for newbinary













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   119


diff --git a/newbinary b/newbinary













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   120


new file mode 100644













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   121


index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   122


GIT binary patch













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   123


literal 1













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   124


Ic${MZ000310RR91













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   125














e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   126


% git=auto: git diff for newempty













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   127


diff --git a/newempty b/newempty













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   128


new file mode 100644













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   129


% git=auto: git diff for rmempty













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   130


diff --git a/rmempty b/rmempty













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   131


deleted file mode 100644













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   132


% git=warn: regular diff with data loss warnings













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   133


diff -r b3f053cd7c7f binary













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   134


Binary file binary has changed













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   135


diff -r b3f053cd7c7f exec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   136


--- a/exec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   137


+++ b/exec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   138


@@ -1,1 +1,2 @@













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   139


 exec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   140


+exec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   141


diff -r b3f053cd7c7f newbinary













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   142


Binary file newbinary has changed













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   143


diff -r b3f053cd7c7f newexec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   144


--- /dev/null













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   145


+++ b/newexec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   146


@@ -0,0 +1,1 @@













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   147


+newexec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   148


diff -r b3f053cd7c7f newregular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   149


--- /dev/null













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   150


+++ b/newregular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   151


@@ -0,0 +1,1 @@













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   152


+newregular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   153


diff -r b3f053cd7c7f regular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   154


--- a/regular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   155


+++ b/regular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   156


@@ -1,1 +1,2 @@













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   157


 regular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   158


+regular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   159


diff -r b3f053cd7c7f rmbinary













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   160


Binary file rmbinary has changed













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   161


diff -r b3f053cd7c7f rmexec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   162


--- a/rmexec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   163


+++ /dev/null













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   164


@@ -1,1 +0,0 @@













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   165


-rmexec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   166


diff -r b3f053cd7c7f rmregular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   167


--- a/rmregular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   168


+++ /dev/null













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   169


@@ -1,1 +0,0 @@













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   170


-rmregular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   171


data lost for: binary













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   172


data lost for: newbinary













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   173


data lost for: newempty













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   174


data lost for: newexec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   175


data lost for: rmempty













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   176


data lost for: setexec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   177


data lost for: unsetexec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   178


% git=abort: fail on execute bit change













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   179


abort: losing data for setexec













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   180


% git=abort: succeed on regular file













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   181


diff -r b3f053cd7c7f regular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   182


--- a/regular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   183


+++ b/regular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   184


@@ -1,1 +1,2 @@













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   185


 regular













e451e599fbcf
patch: support diff data loss detection and upgrade



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   186


+regular















Mercurial