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

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Gregory Szorc - - Load All Authors

File last commit:

r34990:1a314176 stable


                r38817:bb54db4a

@96 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

        > [subrepos]

        > allowed = true

        > svn:allowed = true

        > 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 -qm 'init project' svn-project-2499 "$SVNREPOURL"

      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
				> [subrepos]
				> allowed = true
				> svn:allowed = true
				> 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 -qm 'init project' svn-project-2499 "$SVNREPOURL"

				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 ..