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

merge: remove obsolete check for untracked files in 'dm' action...

merge: remove obsolete check for untracked files in 'dm' action Since (merge: don't use unknown(), 2012-02-09), untracked files are no longer included in the manifest diff, so there is no need to check exclude them when renaming files for directory moves with the 'dm' action.

Yuya Nishihara - - Load All Authors

File last commit:

r23172:e955549c default


                r23387:3eb99f8e

default

Download file

             test-mq-subrepo-svn.t
        
                    56 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-subrepo-svn.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require svn13

        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > mq =

        > [diff]

        > nodates = 1

        > EOF

      fn to create new repository, and cd into it

        $ mkrepo() {

        >     hg init $1

        >     cd $1

        >     hg qinit

        > }

      handle svn subrepos safely

        $ svnadmin create svn-repo-2499

        $ SVNREPOPATH=`pwd`/svn-repo-2499/project

      #if windows

        $ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`

      #else

        $ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`

      #endif

        $ mkdir -p svn-project-2499/trunk

        $ svn import -m 'init project' svn-project-2499 "$SVNREPOURL"

        Adding         svn-project-2499/trunk (glob)

        Committed revision 1.

      qnew on repo w/svn subrepo

        $ mkrepo repo-2499-svn-subrepo

        $ svn co "$SVNREPOURL"/trunk sub

        Checked out revision 1.

        $ echo 'sub = [svn]sub' >> .hgsub

        $ hg add .hgsub

        $ hg status -S -X '**/format'

        A .hgsub

        $ hg qnew -m0 0.diff

        $ cd sub

        $ echo a > a

        $ svn add a

        A         a

        $ svn st

        A*    a (glob)

        $ cd ..

        $ hg status -S        # doesn't show status for svn subrepos (yet)

        $ hg qnew -m1 1.diff

        abort: uncommitted changes in subrepository sub

        [255]

        $ 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

				#require svn13

				$ cat <<EOF >> $HGRCPATH
				> [extensions]
				> mq =
				> [diff]
				> nodates = 1
				> EOF

				fn to create new repository, and cd into it
				$ mkrepo() {
				> hg init $1
				> cd $1
				> hg qinit
				> }


				handle svn subrepos safely

				$ svnadmin create svn-repo-2499

				$ SVNREPOPATH=`pwd`/svn-repo-2499/project
				#if windows
				$ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
				#else
				$ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
				#endif

				$ mkdir -p svn-project-2499/trunk
				$ svn import -m 'init project' svn-project-2499 "$SVNREPOURL"
				Adding svn-project-2499/trunk (glob)

				Committed revision 1.

				qnew on repo w/svn subrepo
				$ mkrepo repo-2499-svn-subrepo
				$ svn co "$SVNREPOURL"/trunk sub
				Checked out revision 1.
				$ echo 'sub = [svn]sub' >> .hgsub
				$ hg add .hgsub
				$ hg status -S -X '**/format'
				A .hgsub
				$ hg qnew -m0 0.diff
				$ cd sub
				$ echo a > a
				$ svn add a
				A a
				$ svn st
				A* a (glob)
				$ cd ..
				$ hg status -S # doesn't show status for svn subrepos (yet)
				$ hg qnew -m1 1.diff
				abort: uncommitted changes in subrepository sub
				[255]

				$ cd ..