upstream/mercurial-mirror Files · tests/test-diff-newlines.t

shelve: directly handle the initial parent alignment...

shelve: directly handle the initial parent alignment Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to handle the parent alignment directly. After this change, we no longer need to use rebase in shelve. Differential Revision: https://phab.mercurial-scm.org/D3693

Boris Feld - - Load All Authors

File last commit:

r33305:aaa1f8f5 default


                r38637:c829749e

default

Download file

             test-diff-newlines.t
        
                    19 lines
            
             | 426 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-newlines.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-diff-newlines

              r12143
            
        $ hg init

        Boris Feld
    
py3: fix test-diff-newlines.t to be compatible with py3

              r33305
            
        $ $PYTHON -c 'open("a", "wb").write(b"confuse str.splitlines\nembedded\rnewline\n")'

        Adrian Buehlmann
    
tests: unify test-diff-newlines

              r12143
            
        $ hg ci -Ama -d '1 0'

        adding a

        $ echo clean diff >> a

        $ hg ci -mb -d '2 0'

        $ hg diff -r0 -r1

        diff -r 107ba6f817b5 -r 310ce7989cdc a

        --- a/a	Thu Jan 01 00:00:01 1970 +0000

        +++ b/a	Thu Jan 01 00:00:02 1970 +0000

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

         confuse str.splitlines

        Mads Kiilerich
    
run-tests: allow test output lines to be terminated with \r in addition to \n...

              r17742
            
         embedded\r (no-eol) (esc)

        newline

        Adrian Buehlmann
    
tests: unify test-diff-newlines

              r12143
            
        +clean diff

	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

Adrian Buehlmann tests: unify test-diff-newlines	r12143	$ hg init

Boris Feld py3: fix test-diff-newlines.t to be compatible with py3	r33305	$ $PYTHON -c 'open("a", "wb").write(b"confuse str.splitlines\nembedded\rnewline\n")'
Adrian Buehlmann tests: unify test-diff-newlines	r12143	$ hg ci -Ama -d '1 0'
		adding a

		$ echo clean diff >> a
		$ hg ci -mb -d '2 0'

		$ hg diff -r0 -r1
		diff -r 107ba6f817b5 -r 310ce7989cdc a
		--- a/a Thu Jan 01 00:00:01 1970 +0000
		+++ b/a Thu Jan 01 00:00:02 1970 +0000
		@@ -1,2 +1,3 @@
		confuse str.splitlines
Mads Kiilerich run-tests: allow test output lines to be terminated with \r in addition to \n...	r17742	embedded\r (no-eol) (esc)
		newline
Adrian Buehlmann tests: unify test-diff-newlines	r12143	+clean diff