##// END OF EJS Templates
patch: don't separate \r and \n when colorizing diff output...
patch: don't separate \r and \n when colorizing diff output When displaying diffs, \r at the end of a line is treated as trailing whitespace. This causes an ANSI escape code to be inserted between \r and \n. Some programs, such as less since version 530 (maybe earlier, but at least not version 487) displays ^M when it encounters a lone \r. This causes a lot of noise in diff output on Windows, where \r\n is used to terminate lines. We avoid that by treating both \n and \r\n as end of line when considering trailing whitespace.

File last commit:

r34662:eb586ed5 default
r38649:e1987261 default
Show More
test-pull-permission.t
33 lines | 655 B | text/troff | Tads3Lexer
/ tests / test-pull-permission.t
Matt Mackall
tests: change some #ifs to #requires
r22047 #require unix-permissions no-root
Mads Kiilerich
tests: add missing 'hghave unix-permissions'
r15516
Martin Geisler
tests: remove redundant mkdir...
r13956 $ hg init a
Adrian Buehlmann
combine tests
r12279 $ cd a
$ echo foo > b
$ hg add b
$ hg ci -m "b"
$ chmod -w .hg/store
$ cd ..
$ hg clone a b
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets 97310831fa1a
Adrian Buehlmann
combine tests
r12279 updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ chmod +w a/.hg/store # let test clean up
$ cd b
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913 $ cd ..