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-mactext.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Oct 2008 20:13:53 +0200
changeset 7104 9514cbb6e4f6
parent 6482 529d7887ecfe
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:
6481
e837dded56c7 win32text: Add macencode/macdecode
OHASHI Hideya <ohachige@gmail.com>
parents:
diff changeset 
     1
 
[hooks]
e837dded56c7 win32text: Add macencode/macdecode
OHASHI Hideya <ohachige@gmail.com>
parents:
diff changeset 
     2
 
pretxncommit.cr = python:hgext.win32text.forbidcr
e837dded56c7 win32text: Add macencode/macdecode
OHASHI Hideya <ohachige@gmail.com>
parents:
diff changeset 
     3
 
pretxnchangegroup.cr = python:hgext.win32text.forbidcr
e837dded56c7 win32text: Add macencode/macdecode
OHASHI Hideya <ohachige@gmail.com>
parents:
diff changeset 
     4
 












e837dded56c7
win32text: Add macencode/macdecode



OHASHI Hideya <ohachige@gmail.com>


parents: 

diff
changeset




     5














e837dded56c7
win32text: Add macencode/macdecode



OHASHI Hideya <ohachige@gmail.com>


parents: 

diff
changeset




     6


Attempt to commit or push text file(s) using CR line endings












e837dded56c7
win32text: Add macencode/macdecode



OHASHI Hideya <ohachige@gmail.com>


parents: 

diff
changeset




     7


in dea860dc51ec: f












e837dded56c7
win32text: Add macencode/macdecode



OHASHI Hideya <ohachige@gmail.com>


parents: 

diff
changeset




     8


transaction abort!












e837dded56c7
win32text: Add macencode/macdecode



OHASHI Hideya <ohachige@gmail.com>


parents: 

diff
changeset




     9


rollback completed












e837dded56c7
win32text: Add macencode/macdecode



OHASHI Hideya <ohachige@gmail.com>


parents: 

diff
changeset




    10


abort: pretxncommit.cr hook failed







6482






529d7887ecfe
test-mactext: simplify test, coverage is ensured by win32text tests



Patrick Mezard <pmezard@gmail.com>


parents: 
6481

diff
changeset




    11


hello<LF>












529d7887ecfe
test-mactext: simplify test, coverage is ensured by win32text tests



Patrick Mezard <pmezard@gmail.com>


parents: 
6481

diff
changeset




    12


hello<CR>














mercurial