upstream/mercurial-mirror Files · tests/test-mq-symlinks.t

rebase: choose default destination the same way as 'hg merge' (BC)...

rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

Matt Mackall - - Load All Authors

File last commit:

r25472:4d2b9b30 default


                r28189:fac3a24b

default

Download file

             test-mq-symlinks.t
        
                    111 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-symlinks.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require symlink

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init

        $ hg qinit

        $ hg qnew base.patch

        $ echo aaa > a

        $ echo bbb > b

        $ echo ccc > c

        $ hg add a b c

        $ hg qrefresh

        $ readlink.py a

        a -> a not a symlink

      test replacing a file with a symlink

        $ hg qnew symlink.patch

        $ rm a

        $ ln -s b a

        $ hg qrefresh --git

        $ readlink.py a

        a -> b

        $ hg qpop

        popping symlink.patch

        now at: base.patch

        $ hg qpush

        applying symlink.patch

        now at: symlink.patch

        $ readlink.py a

        a -> b

      test updating a symlink

        $ rm a

        $ ln -s c a

        $ hg qnew --git -f updatelink

        $ readlink.py a

        a -> c

        $ hg qpop

        popping updatelink

        now at: symlink.patch

        $ hg qpush --debug

        applying updatelink

        patching file a

        committing files:

        a

        committing manifest

        committing changelog

        now at: updatelink

        $ readlink.py a

        a -> c

        $ hg st

      test replacing a symlink with a file

        $ ln -s c s

        $ hg add s

        $ hg qnew --git -f addlink

        $ rm s

        $ echo sss > s

        $ hg qnew --git -f replacelinkwithfile

        $ hg qpop

        popping replacelinkwithfile

        now at: addlink

        $ hg qpush

        applying replacelinkwithfile

        now at: replacelinkwithfile

        $ cat s

        sss

        $ hg st

      test symlink removal

        $ hg qnew removesl.patch

        $ hg rm a

        $ hg qrefresh --git

        $ hg qpop

        popping removesl.patch

        now at: replacelinkwithfile

        $ hg qpush

        applying removesl.patch

        now at: removesl.patch

        $ hg st -c

        C b

        C c

        C s

      replace broken symlink with another broken symlink

        $ ln -s linka linka

        $ hg add linka

        $ hg qnew link

        $ hg mv linka linkb

        $ rm linkb

        $ ln -s linkb linkb

        $ hg qnew movelink

        $ hg qpop

        popping movelink

        now at: link

        $ hg qpush

        applying movelink

        now at: movelink

        $ readlink.py linkb

        linkb -> linkb

	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

				#require symlink

				$ echo "[extensions]" >> $HGRCPATH
				$ echo "mq=" >> $HGRCPATH

				$ hg init
				$ hg qinit
				$ hg qnew base.patch
				$ echo aaa > a
				$ echo bbb > b
				$ echo ccc > c
				$ hg add a b c
				$ hg qrefresh
				$ readlink.py a
				a -> a not a symlink


				test replacing a file with a symlink

				$ hg qnew symlink.patch
				$ rm a
				$ ln -s b a
				$ hg qrefresh --git
				$ readlink.py a
				a -> b

				$ hg qpop
				popping symlink.patch
				now at: base.patch
				$ hg qpush
				applying symlink.patch
				now at: symlink.patch
				$ readlink.py a
				a -> b


				test updating a symlink

				$ rm a
				$ ln -s c a
				$ hg qnew --git -f updatelink
				$ readlink.py a
				a -> c
				$ hg qpop
				popping updatelink
				now at: symlink.patch
				$ hg qpush --debug
				applying updatelink
				patching file a
				committing files:
				a
				committing manifest
				committing changelog
				now at: updatelink
				$ readlink.py a
				a -> c
				$ hg st


				test replacing a symlink with a file

				$ ln -s c s
				$ hg add s
				$ hg qnew --git -f addlink
				$ rm s
				$ echo sss > s
				$ hg qnew --git -f replacelinkwithfile
				$ hg qpop
				popping replacelinkwithfile
				now at: addlink
				$ hg qpush
				applying replacelinkwithfile
				now at: replacelinkwithfile
				$ cat s
				sss
				$ hg st


				test symlink removal

				$ hg qnew removesl.patch
				$ hg rm a
				$ hg qrefresh --git
				$ hg qpop
				popping removesl.patch
				now at: replacelinkwithfile
				$ hg qpush
				applying removesl.patch
				now at: removesl.patch
				$ hg st -c
				C b
				C c
				C s

				replace broken symlink with another broken symlink

				$ ln -s linka linka
				$ hg add linka
				$ hg qnew link
				$ hg mv linka linkb
				$ rm linkb
				$ ln -s linkb linkb
				$ hg qnew movelink
				$ hg qpop
				popping movelink
				now at: link
				$ hg qpush
				applying movelink
				now at: movelink
				$ readlink.py linkb
				linkb -> linkb