upstream/mercurial-mirror Files · tests/test-issue612.t

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.

Matt Mackall - - Load All Authors

File last commit:

r26420:2fc86d92 default


                r38649:e1987261

default

Download file

             test-issue612.t
        
                    34 lines
            
             | 617 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue612.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
urls: bulk-change BTS urls to new location

              r26420
            
      https://bz.mercurial-scm.org/612

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg init

        $ mkdir src

        $ echo a > src/a.c

        $ hg ci -Ama

        adding src/a.c

        $ hg mv src source

        Matt Harbison
    
tests: remove (glob) annotations that were only for '\' matches...

              r35394
            
        moving src/a.c to source/a.c

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg ci -Ammove

        $ hg co -C 0

        1 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ echo new > src/a.c

        $ echo compiled > src/a.o

        $ hg ci -mupdate

        created new head

        $ hg status

        ? src/a.o

        $ hg merge

        merging src/a.c and source/a.c to source/a.c

        Matt Mackall
    
merge: don't use unknown()...

              r16094
            
        0 files updated, 1 files merged, 0 files removed, 0 files unresolved

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        (branch merge, don't forget to commit)

        $ hg status

        M source/a.c

        R src/a.c

        Matt Mackall
    
merge: don't use unknown()...

              r16094
            
        ? src/a.o

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Matt Mackall urls: bulk-change BTS urls to new location	r26420	https://bz.mercurial-scm.org/612
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg init
		$ mkdir src
		$ echo a > src/a.c
		$ hg ci -Ama
		adding src/a.c

		$ hg mv src source
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	moving src/a.c to source/a.c
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg ci -Ammove

		$ hg co -C 0
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved

		$ echo new > src/a.c
		$ echo compiled > src/a.o
		$ hg ci -mupdate
		created new head

		$ hg status
		? src/a.o

		$ hg merge
		merging src/a.c and source/a.c to source/a.c
Matt Mackall merge: don't use unknown()...	r16094	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
Adrian Buehlmann tests: unify test-issue*	r12195	(branch merge, don't forget to commit)

		$ hg status
		M source/a.c
		R src/a.c
Matt Mackall merge: don't use unknown()...	r16094	? src/a.o
Adrian Buehlmann tests: unify test-issue*	r12195