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

resolve: fix incorrect merge...

resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r27025:ec372573

default

Download file

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

        $ hg init a

        $ hg clone a b

        updating to branch default

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

        $ cd a

        $ echo '[paths]' >> .hg/hgrc

        $ echo 'dupe = ../b' >> .hg/hgrc

        $ echo 'expand = $SOMETHING/bar' >> .hg/hgrc

        $ hg in dupe

        comparing with $TESTTMP/b (glob)

        no changes found

        [1]

        $ cd ..

        $ hg -R a in dupe

        comparing with $TESTTMP/b (glob)

        no changes found

        [1]

        $ cd a

        $ hg paths

        dupe = $TESTTMP/b (glob)

        expand = $TESTTMP/a/$SOMETHING/bar (glob)

        $ SOMETHING=foo hg paths

        dupe = $TESTTMP/b (glob)

        expand = $TESTTMP/a/foo/bar (glob)

      #if msys

        $ SOMETHING=//foo hg paths

        dupe = $TESTTMP/b (glob)

        expand = /foo/bar

      #else

        $ SOMETHING=/foo hg paths

        dupe = $TESTTMP/b (glob)

        expand = /foo/bar

      #endif

        $ hg paths -q

        dupe

        expand

        $ hg paths dupe

        $TESTTMP/b (glob)

        $ hg paths -q dupe

        $ hg paths unknown

        not found!

        [1]

        $ hg paths -q unknown

        [1]

        $ cd ..

      'file:' disables [paths] entries for clone destination

        $ cat >> $HGRCPATH <<EOF

        > [paths]

        > gpath1 = http://hg.example.com

        > EOF

        $ hg clone a gpath1

        abort: cannot create new http repository

        [255]

        $ hg clone a file:gpath1

        updating to branch default

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

        $ cd gpath1

        $ hg -q id

        000000000000

        $ 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

				$ hg init a
				$ hg clone a b
				updating to branch default
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd a
				$ echo '[paths]' >> .hg/hgrc
				$ echo 'dupe = ../b' >> .hg/hgrc
				$ echo 'expand = $SOMETHING/bar' >> .hg/hgrc
				$ hg in dupe
				comparing with $TESTTMP/b (glob)
				no changes found
				[1]
				$ cd ..
				$ hg -R a in dupe
				comparing with $TESTTMP/b (glob)
				no changes found
				[1]
				$ cd a
				$ hg paths
				dupe = $TESTTMP/b (glob)
				expand = $TESTTMP/a/$SOMETHING/bar (glob)
				$ SOMETHING=foo hg paths
				dupe = $TESTTMP/b (glob)
				expand = $TESTTMP/a/foo/bar (glob)
				#if msys
				$ SOMETHING=//foo hg paths
				dupe = $TESTTMP/b (glob)
				expand = /foo/bar
				#else
				$ SOMETHING=/foo hg paths
				dupe = $TESTTMP/b (glob)
				expand = /foo/bar
				#endif
				$ hg paths -q
				dupe
				expand
				$ hg paths dupe
				$TESTTMP/b (glob)
				$ hg paths -q dupe
				$ hg paths unknown
				not found!
				[1]
				$ hg paths -q unknown
				[1]
				$ cd ..

				'file:' disables [paths] entries for clone destination

				$ cat >> $HGRCPATH <<EOF
				> [paths]
				> gpath1 = http://hg.example.com
				> EOF

				$ hg clone a gpath1
				abort: cannot create new http repository
				[255]

				$ hg clone a file:gpath1
				updating to branch default
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd gpath1
				$ hg -q id
				000000000000

				$ cd ..