upstream/mercurial-mirror Files · tests/test-debian-packages.t

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

timeless - - Load All Authors

File last commit:

r29219:3c9066ed default


                r32255:7e35d31b

default

Download file

             test-debian-packages.t
        
                    22 lines
            
             | 751 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-debian-packages.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require test-repo slow debhelper

        $ . "$TESTDIR/helpers-testrepo.sh"

      Ensure debuild doesn't run the testsuite, as that could get silly.

        $ DEB_BUILD_OPTIONS=nocheck

        $ export DEB_BUILD_OPTIONS

        $ OUTPUTDIR=`pwd`

        $ export OUTPUTDIR

        $ cd "$TESTDIR"/..

        $ make deb > $OUTPUTDIR/build.log 2>&1

        $ cd $OUTPUTDIR

        $ ls *.deb

        mercurial-common_*.deb (glob)

        mercurial_*.deb (glob)

      main deb should have .so but no .py

        $ dpkg --contents mercurial_*.deb | egrep '(localrepo|parsers)'

        * ./usr/lib/python2.7/dist-packages/mercurial/parsers*.so (glob)

      mercurial-common should have py but no .so or pyc

        $ dpkg --contents mercurial-common_*.deb | egrep '(localrepo|parsers)'

        * ./usr/lib/python2.7/dist-packages/mercurial/localrepo.py (glob)

	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 test-repo slow debhelper

				$ . "$TESTDIR/helpers-testrepo.sh"

				Ensure debuild doesn't run the testsuite, as that could get silly.
				$ DEB_BUILD_OPTIONS=nocheck
				$ export DEB_BUILD_OPTIONS
				$ OUTPUTDIR=`pwd`
				$ export OUTPUTDIR

				$ cd "$TESTDIR"/..
				$ make deb > $OUTPUTDIR/build.log 2>&1
				$ cd $OUTPUTDIR
				$ ls *.deb
				mercurial-common_*.deb (glob)
				mercurial_*.deb (glob)
				main deb should have .so but no .py
				$ dpkg --contents mercurial_*.deb \| egrep '(localrepo\|parsers)'
				* ./usr/lib/python2.7/dist-packages/mercurial/parsers*.so (glob)
				mercurial-common should have py but no .so or pyc
				$ dpkg --contents mercurial-common_*.deb \| egrep '(localrepo\|parsers)'
				* ./usr/lib/python2.7/dist-packages/mercurial/localrepo.py (glob)