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

Siddharth Agarwal - - Load All Authors

File last commit:

r23451:5fb1fc2e default


                r29480:1e4512ea

default

Download file

             test-hgk.t
        
                    47 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-hgk.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-hgk

              r12431
            
      Minimal hgk check

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "hgk=" >> $HGRCPATH

        $ hg init repo

        $ cd repo

        $ echo a > a

        $ hg ci -Am adda

        adding a

        $ hg debug-cat-file commit 0

        tree a0c8bcbbb45c

        parent 000000000000

        author test 0 0

        revision 0

        branch default

        Andrew Shadura
    
hgk: add support for phases...

              r18807
            
        phase draft

        Matt Mackall
    
tests: unify test-hgk

              r12431
            
        adda

        Siddharth Agarwal
    
hgk: don't honor whitespace and format-changing diffopts...

              r23451
            
        $ echo b > b

        $ hg ci -Am addb

        adding b

        $ hg log -T '{node}\n'

        102a90ea7b4a3361e4082ed620918c261189a36a

        07f4944404050f47db2e5c5071e0e84e7a27bba9

        $ hg debug-diff-tree 07f494440405 102a90ea7b4a

        :000000 100664 000000000000 1e88685f5dde N	b	b

        $ hg debug-diff-tree 07f494440405 102a90ea7b4a --patch

        diff --git a/b b/b

        new file mode 100644

        --- /dev/null

        +++ b/b

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

        +b

      Ensure that diff-tree output isn't affected by diffopts

        $ hg --config diff.noprefix=True debug-diff-tree 07f494440405 102a90ea7b4a

        :000000 100664 000000000000 1e88685f5dde N	b	b

        $ hg --config diff.noprefix=True debug-diff-tree --patch 07f494440405 102a90ea7b4a

        diff --git a/b b/b

        new file mode 100644

        --- /dev/null

        +++ b/b

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

        +b

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ cd ..

	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

Matt Mackall tests: unify test-hgk	r12431	Minimal hgk check

		$ echo "[extensions]" >> $HGRCPATH
		$ echo "hgk=" >> $HGRCPATH
		$ hg init repo
		$ cd repo
		$ echo a > a
		$ hg ci -Am adda
		adding a
		$ hg debug-cat-file commit 0
		tree a0c8bcbbb45c
		parent 000000000000
		author test 0 0
		revision 0
		branch default
Andrew Shadura hgk: add support for phases...	r18807	phase draft
Matt Mackall tests: unify test-hgk	r12431
		adda
Siddharth Agarwal hgk: don't honor whitespace and format-changing diffopts...	r23451	$ echo b > b
		$ hg ci -Am addb
		adding b
		$ hg log -T '{node}\n'
		102a90ea7b4a3361e4082ed620918c261189a36a
		07f4944404050f47db2e5c5071e0e84e7a27bba9

		$ hg debug-diff-tree 07f494440405 102a90ea7b4a
		:000000 100664 000000000000 1e88685f5dde N b b
		$ hg debug-diff-tree 07f494440405 102a90ea7b4a --patch
		diff --git a/b b/b
		new file mode 100644
		--- /dev/null
		+++ b/b
		@@ -0,0 +1,1 @@
		+b

		Ensure that diff-tree output isn't affected by diffopts
		$ hg --config diff.noprefix=True debug-diff-tree 07f494440405 102a90ea7b4a
		:000000 100664 000000000000 1e88685f5dde N b b
		$ hg --config diff.noprefix=True debug-diff-tree --patch 07f494440405 102a90ea7b4a
		diff --git a/b b/b
		new file mode 100644
		--- /dev/null
		+++ b/b
		@@ -0,0 +1,1 @@
		+b
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..