upstream/mercurial-mirror Files · tests/test-diff-reverse.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.

Adrian Buehlmann - - Load All Authors

File last commit:

r12139:5a69ea8d default


                r22180:17011b36

stable

Download file

             test-diff-reverse.t
        
                    44 lines
            
             | 513 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-reverse.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ cat > a <<EOF

        > a

        > b

        > c

        > EOF

        $ hg ci -Am adda

        adding a

        $ cat > a <<EOF

        > d

        > e

        > f

        > EOF

        $ hg ci -m moda

        $ hg diff --reverse -r0 -r1

        diff -r 2855cdcfcbb7 -r 8e1805a3cf6e a

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

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

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

        -d

        -e

        -f

        +a

        +b

        +c

        $ cat >> a <<EOF

        > g

        > h

        > EOF

        $ hg diff --reverse --nodates

        diff -r 2855cdcfcbb7 a

        --- a/a

        +++ b/a

        @@ -1,5 +1,3 @@

         d

         e

         f

        -g

        -h

	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

				$ cat > a <<EOF
				> a
				> b
				> c
				> EOF
				$ hg ci -Am adda
				adding a

				$ cat > a <<EOF
				> d
				> e
				> f
				> EOF
				$ hg ci -m moda

				$ hg diff --reverse -r0 -r1
				diff -r 2855cdcfcbb7 -r 8e1805a3cf6e a
				--- a/a Thu Jan 01 00:00:00 1970 +0000
				+++ b/a Thu Jan 01 00:00:00 1970 +0000
				@@ -1,3 +1,3 @@
				-d
				-e
				-f
				+a
				+b
				+c

				$ cat >> a <<EOF
				> g
				> h
				> EOF
				$ hg diff --reverse --nodates
				diff -r 2855cdcfcbb7 a
				--- a/a
				+++ b/a
				@@ -1,5 +1,3 @@
				d
				e
				f
				-g
				-h