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

changectx: ancestor should only prefer merge.preferancestor if it is a revision...

changectx: ancestor should only prefer merge.preferancestor if it is a revision The value '*' currently designates that bid merge should be used. The best way to test bid merge is to set preferancestor=* in the configuration file ... but then it would abort with unknown revision '*' when other code paths ended up in changectx.ancestor . Instead, just skip and ignore the value '*' when looking for a preferred ancestor.

Mads Kiilerich - - Load All Authors

File last commit:

r17742:405b6bd0 default


                r22180:17011b36

stable

Download file

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

        $ hg init

        $ python -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'

        $ 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

         embedded\r (no-eol) (esc)

        newline

        +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

				$ hg init

				$ python -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'
				$ 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
				embedded\r (no-eol) (esc)
				newline
				+clean diff