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-encode.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Oct 2008 20:13:53 +0200
changeset 7104 9514cbb6e4f6
parent 6093 f5b00b6e426a
child 10211 a474f950357b
permissions -rw-r--r--
bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1258
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset 
     1
 
%% no changes
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset 
     2
 
%% no changes
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset 
     3
 
%% uncompressed contents in repo
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset 
     4
 
this is a test
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset 
     5
 
%% uncompress our working dir copy
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset 
     6
 
this is a test
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1258
diff changeset 
     7
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1258
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset 
     8
 
%% uncompress our new working dir copy
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset 
     9
 
this is a test
6093
f5b00b6e426a Option --decode for hg cat to apply decode filters.
Jesse Glick <jesse.glick@sun.com>
parents: 2175
diff changeset 
    10
 
%% check hg cat operation
f5b00b6e426a Option --decode for hg cat to apply decode filters.
Jesse Glick <jesse.glick@sun.com>
parents: 2175
diff changeset 
    11
 
this is a test
f5b00b6e426a Option --decode for hg cat to apply decode filters.
Jesse Glick <jesse.glick@sun.com>
parents: 2175
diff changeset 
    12
 
this is a test
f5b00b6e426a Option --decode for hg cat to apply decode filters.
Jesse Glick <jesse.glick@sun.com>
parents: 2175
diff changeset 
    13
 
this is a test
f5b00b6e426a Option --decode for hg cat to apply decode filters.
Jesse Glick <jesse.glick@sun.com>
parents: 2175
diff changeset 
    14
 
this is a test
Mercurial