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

diff: don't crash when merged-in addition was removed (issue4786)...

diff: don't crash when merged-in addition was removed (issue4786) During a merge, if the user removes a file that came from parent 2 and did not exist in parent 1, the file's status will be "removed". This surprises the diff code, which crashes because it expects removed files exist in parent 1. This has been broken since (trydiff: use 'not in addedset' for symmetry with 'not in removedset', 2014-12-23). Fix by fixing up the list of removed file, similar to how we currently fix up the list of modified and added files during a merge.

Martin von Zweigbergk - - Load All Authors

File last commit:

r27901:29c8e35d default


                r27901:29c8e35d

default

Download file

             test-diffdir.t
        
                    70 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diffdir.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ touch a

        $ hg add a

        $ hg ci -m "a"

        $ echo 123 > b

        $ hg add b

        $ hg diff --nodates

        diff -r 3903775176ed b

        --- /dev/null

        +++ b/b

        @@ -0,0 +1,1 @@

        +123

        $ hg diff --nodates -r tip

        diff -r 3903775176ed b

        --- /dev/null

        +++ b/b

        @@ -0,0 +1,1 @@

        +123

        $ echo foo > a

        $ hg diff --nodates

        diff -r 3903775176ed a

        --- a/a

        +++ b/a

        @@ -0,0 +1,1 @@

        +foo

        diff -r 3903775176ed b

        --- /dev/null

        +++ b/b

        @@ -0,0 +1,1 @@

        +123

        $ hg diff -r ""

        hg: parse error: empty query

        [255]

        $ hg diff -r tip -r ""

        hg: parse error: empty query

        [255]

      Remove a file that was added via merge. Since the file is not in parent 1,

      it should not be in the diff.

        $ hg ci -m 'a=foo' a

        $ hg co -Cq null

        $ echo 123 > b

        $ hg add b

        $ hg ci -m "b"

        created new head

        $ hg merge 1

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

        (branch merge, don't forget to commit)

        $ hg rm -f a

        $ hg diff --nodates

      Rename a file that was added via merge. Since the rename source is not in

      parent 1, the diff should be relative to /dev/null

        $ hg co -Cq 2

        $ hg merge 1

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

        (branch merge, don't forget to commit)

        $ hg mv a a2

        $ hg diff --nodates

        diff -r cf44b38435e5 a2

        --- /dev/null

        +++ b/a2

        @@ -0,0 +1,1 @@

        +foo

	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
				$ touch a
				$ hg add a
				$ hg ci -m "a"

				$ echo 123 > b
				$ hg add b
				$ hg diff --nodates
				diff -r 3903775176ed b
				--- /dev/null
				+++ b/b
				@@ -0,0 +1,1 @@
				+123

				$ hg diff --nodates -r tip
				diff -r 3903775176ed b
				--- /dev/null
				+++ b/b
				@@ -0,0 +1,1 @@
				+123

				$ echo foo > a
				$ hg diff --nodates
				diff -r 3903775176ed a
				--- a/a
				+++ b/a
				@@ -0,0 +1,1 @@
				+foo
				diff -r 3903775176ed b
				--- /dev/null
				+++ b/b
				@@ -0,0 +1,1 @@
				+123

				$ hg diff -r ""
				hg: parse error: empty query
				[255]
				$ hg diff -r tip -r ""
				hg: parse error: empty query
				[255]

				Remove a file that was added via merge. Since the file is not in parent 1,
				it should not be in the diff.

				$ hg ci -m 'a=foo' a
				$ hg co -Cq null
				$ echo 123 > b
				$ hg add b
				$ hg ci -m "b"
				created new head
				$ hg merge 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg rm -f a
				$ hg diff --nodates

				Rename a file that was added via merge. Since the rename source is not in
				parent 1, the diff should be relative to /dev/null

				$ hg co -Cq 2
				$ hg merge 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg mv a a2
				$ hg diff --nodates
				diff -r cf44b38435e5 a2
				--- /dev/null
				+++ b/a2
				@@ -0,0 +1,1 @@
				+foo