upstream/mercurial-mirror Files · tests/test-check-commit.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.

David Soria Parra - - Load All Authors

File last commit:

r30648:2cab496d default


                r32255:7e35d31b

default

Download file

             test-check-commit.t
        
                    21 lines
            
             | 612 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-check-commit.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require test-repo

      Enable obsolescence to avoid the warning issue when obsmarker are found

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

      Go back in the hg repo

        $ cd $TESTDIR/..

        $ for node in `hg log --rev 'not public() and ::. and not desc("# no-check-commit")' --template '{node|short}\n'`; do

        >    hg export $node | contrib/check-commit > ${TESTTMP}/check-commit.out

        >    if [ $? -ne 0 ]; then

        >        echo "Revision $node does not comply with rules"

        >        echo '------------------------------------------------------'

        >        cat ${TESTTMP}/check-commit.out

        >        echo

        >   fi

        > done

	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

				Enable obsolescence to avoid the warning issue when obsmarker are found

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

				Go back in the hg repo

				$ cd $TESTDIR/..

				$ for node in `hg log --rev 'not public() and ::. and not desc("# no-check-commit")' --template '{node\|short}\n'`; do
				> hg export $node \| contrib/check-commit > ${TESTTMP}/check-commit.out
				> if [ $? -ne 0 ]; then
				> echo "Revision $node does not comply with rules"
				> echo '------------------------------------------------------'
				> cat ${TESTTMP}/check-commit.out
				> echo
				> fi
				> done