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

ui: don't fixup [paths] sub-options...

ui: don't fixup [paths] sub-options As part of developing a subsequent patch I discovered that sub-option values like "." were getting converted to paths. This is because the [paths] section is treated specially during config loading. This patch prevents post-processing sub-options from the [paths] section.

timeless - - Load All Authors

File last commit:

r28963:fc1d75e7 default


                r29412:b62bce81

default

Download file

             test-issue1175.t
        
                    96 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1175.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
urls: bulk-change BTS urls to new location

              r26420
            
      https://bz.mercurial-scm.org/1175

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg init

        $ touch a

        $ hg ci -Am0

        adding a

        $ hg mv a a1

        $ hg ci -m1

        $ hg co 0

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

        $ hg mv a a2

        $ hg up

        Dan Villiom Podlaski Christiansen
    
merge: make 'diverging renames' diagnostic a more helpful note....

              r12757
            
        note: possible conflict - a was renamed multiple times to:

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
         a2

         a1

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

        $ hg ci -m2

        $ touch a

        $ hg ci -Am3

        adding a

        $ hg mv a b

        $ hg ci -Am4 a

        $ hg ci --debug --traceback -Am5 b

        Mads Kiilerich
    
localrepo: show headline notes in commitctx before showing filenames...

              r23749
            
        committing files:

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        b

        Ryan McElroy
    
commit: remove reverse search for copy source when not in parent (issue4476)...

              r23929
            
        warning: can't find ancestor for 'b' copied from 'a'!

        Mads Kiilerich
    
localrepo: show headline notes in commitctx before showing filenames...

              r23749
            
        committing manifest

        committing changelog

        Ryan McElroy
    
commit: remove reverse search for copy source when not in parent (issue4476)...

              r23929
            
        committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        4 files, 6 changesets, 4 total revisions

        $ hg export --git tip

        # HG changeset patch

        # User test

        # Date 0 0

        Mads Kiilerich
    
export: show 'Date' header in a format that also is readable for humans...

              r18648
            
        #      Thu Jan 01 00:00:00 1970 +0000

        Ryan McElroy
    
commit: remove reverse search for copy source when not in parent (issue4476)...

              r23929
            
        # Node ID 83a687e8a97c80992ba385bbfd766be181bfb1d1

        Matt Mackall
    
setparents: drop copies from dropped p2 (issue3843)

              r18739
            
        # Parent  1d1625283f71954f21d14c3d44d0ad3c019c597f

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        5

        diff --git a/b b/b

        new file mode 100644

        Ryan McElroy
    
commit: remove reverse search for copy source when not in parent (issue4476)...

              r23929
            
      http://bz.selenic.com/show_bug.cgi?id=4476

        $ hg init foo

        $ cd foo

        $ touch a && hg ci -Aqm a

        $ hg mv a b

        $ echo b1 >> b

        $ hg ci -Aqm b1

        $ hg up 0

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

        $ hg mv a b

        $ echo b2 >> b

        $ hg ci -Aqm b2

        $ hg graft 1

        grafting 1:5974126fad84 "b1"

        merging b

        Siddharth Agarwal
    
simplemerge: move conflict warning message to filemerge...

              r26614
            
        warning: conflicts while merging b! (edit, then use 'hg resolve --mark')

        Ryan McElroy
    
commit: remove reverse search for copy source when not in parent (issue4476)...

              r23929
            
        abort: unresolved conflicts, can't continue

        timeless
    
graft: use single quotes around command hint...

              r28963
            
        (use 'hg resolve' and 'hg graft --continue')

        Ryan McElroy
    
commit: remove reverse search for copy source when not in parent (issue4476)...

              r23929
            
        [255]

        $ echo a > b

        $ echo b3 >> b

        $ hg resolve --mark b

        (no more unresolved files)

        timeless
    
graft: hook afterresolvedstates

              r27625
            
        continue: hg graft --continue

        Ryan McElroy
    
commit: remove reverse search for copy source when not in parent (issue4476)...

              r23929
            
        $ hg graft --continue

        grafting 1:5974126fad84 "b1"

        warning: can't find ancestor for 'b' copied from 'a'!

        $ hg log -f b -T 'changeset:   {rev}:{node|short}\nsummary:     {desc}\n\n'

        changeset:   3:376d30ccffc0

        summary:     b1

        changeset:   2:416baaa2e5e4

        summary:     b2

        changeset:   0:3903775176ed

        summary:     a

	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 urls: bulk-change BTS urls to new location	r26420	https://bz.mercurial-scm.org/1175
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg init
		$ touch a
		$ hg ci -Am0
		adding a

		$ hg mv a a1
		$ hg ci -m1

		$ hg co 0
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved

		$ hg mv a a2
		$ hg up
Dan Villiom Podlaski Christiansen merge: make 'diverging renames' diagnostic a more helpful note....	r12757	note: possible conflict - a was renamed multiple times to:
Adrian Buehlmann tests: unify test-issue*	r12195	a2
		a1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ hg ci -m2

		$ touch a
		$ hg ci -Am3
		adding a

		$ hg mv a b
		$ hg ci -Am4 a

		$ hg ci --debug --traceback -Am5 b
Mads Kiilerich localrepo: show headline notes in commitctx before showing filenames...	r23749	committing files:
Adrian Buehlmann tests: unify test-issue*	r12195	b
Ryan McElroy commit: remove reverse search for copy source when not in parent (issue4476)...	r23929	warning: can't find ancestor for 'b' copied from 'a'!
Mads Kiilerich localrepo: show headline notes in commitctx before showing filenames...	r23749	committing manifest
		committing changelog
Ryan McElroy commit: remove reverse search for copy source when not in parent (issue4476)...	r23929	committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		4 files, 6 changesets, 4 total revisions

		$ hg export --git tip
		# HG changeset patch
		# User test
		# Date 0 0
Mads Kiilerich export: show 'Date' header in a format that also is readable for humans...	r18648	# Thu Jan 01 00:00:00 1970 +0000
Ryan McElroy commit: remove reverse search for copy source when not in parent (issue4476)...	r23929	# Node ID 83a687e8a97c80992ba385bbfd766be181bfb1d1
Matt Mackall setparents: drop copies from dropped p2 (issue3843)	r18739	# Parent 1d1625283f71954f21d14c3d44d0ad3c019c597f
Adrian Buehlmann tests: unify test-issue*	r12195	5

		diff --git a/b b/b
		new file mode 100644

Ryan McElroy commit: remove reverse search for copy source when not in parent (issue4476)...	r23929	http://bz.selenic.com/show_bug.cgi?id=4476

		$ hg init foo
		$ cd foo
		$ touch a && hg ci -Aqm a
		$ hg mv a b
		$ echo b1 >> b
		$ hg ci -Aqm b1
		$ hg up 0
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ hg mv a b
		$ echo b2 >> b
		$ hg ci -Aqm b2
		$ hg graft 1
		grafting 1:5974126fad84 "b1"
		merging b
Siddharth Agarwal simplemerge: move conflict warning message to filemerge...	r26614	warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
Ryan McElroy commit: remove reverse search for copy source when not in parent (issue4476)...	r23929	abort: unresolved conflicts, can't continue
timeless graft: use single quotes around command hint...	r28963	(use 'hg resolve' and 'hg graft --continue')
Ryan McElroy commit: remove reverse search for copy source when not in parent (issue4476)...	r23929	[255]
		$ echo a > b
		$ echo b3 >> b
		$ hg resolve --mark b
		(no more unresolved files)
timeless graft: hook afterresolvedstates	r27625	continue: hg graft --continue
Ryan McElroy commit: remove reverse search for copy source when not in parent (issue4476)...	r23929	$ hg graft --continue
		grafting 1:5974126fad84 "b1"
		warning: can't find ancestor for 'b' copied from 'a'!
		$ hg log -f b -T 'changeset: {rev}:{node\|short}\nsummary: {desc}\n\n'
		changeset: 3:376d30ccffc0
		summary: b1

		changeset: 2:416baaa2e5e4
		summary: b2

		changeset: 0:3903775176ed
		summary: a