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

update: teach hg to override untracked dir with a tracked file on update...

update: teach hg to override untracked dir with a tracked file on update This is a fix to an old problem when Mercurial got confused by an untracked folder with the same name as one of the files in a commit hg was trying to update to. It is pretty safe to remove this folder if it is empty. Backing up an empty folder seems to go against Mercurial's "don't track dirs" philosophy.

Martin von Zweigbergk - - Load All Authors

File last commit:

r23080:c586cb50 stable


                r29480:1e4512ea

default

Download file

             test-diff-reverse.t
        
                    65 lines
            
             | 885 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

      should show removed file 'a' as being added

        $ hg revert a

        $ hg rm a

        $ hg diff --reverse --nodates a

        diff -r 2855cdcfcbb7 a

        --- /dev/null

        +++ b/a

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

        +d

        +e

        +f

      should show added file 'b' as being removed

        $ echo b >> b

        $ hg add b

        $ hg diff --reverse --nodates b

        diff -r 2855cdcfcbb7 b

        --- a/b

        +++ /dev/null

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

        -b

	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

				should show removed file 'a' as being added
				$ hg revert a
				$ hg rm a
				$ hg diff --reverse --nodates a
				diff -r 2855cdcfcbb7 a
				--- /dev/null
				+++ b/a
				@@ -0,0 +1,3 @@
				+d
				+e
				+f

				should show added file 'b' as being removed
				$ echo b >> b
				$ hg add b
				$ hg diff --reverse --nodates b
				diff -r 2855cdcfcbb7 b
				--- a/b
				+++ /dev/null
				@@ -1,1 +0,0 @@
				-b