##// END OF EJS Templates
resolve: fix incorrect merge...
resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

File last commit:

r23623:80a37f70 default
r27025:ec372573 default
Show More
test-check-commit-hg.t
24 lines | 617 B | text/troff | Tads3Lexer
/ tests / test-check-commit-hg.t
Pierre-Yves David
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets...
r22067 #require test-repo
Enable obsolescence to avoid the warning issue when obsmarker are found
Durham Goode
obsolete: update tests to use obsolete options...
r22955 $ cat >> $HGRCPATH << EOF
> [experimental]
> evolution=createmarkers
Pierre-Yves David
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets...
r22067 > EOF
Go back in the hg repo
$ cd $TESTDIR/..
$ for node in `hg log --rev 'draft() and ::.' --template '{node|short}\n'`; do
> hg export $node | contrib/check-commit > ${TESTTMP}/check-commit.out
> if [ $? -ne 0 ]; then
Martin von Zweigbergk
test-check-commit-hg: clarify misleading "commit message rules" error...
r23623 > echo "Revision $node does not comply to rules"
Pierre-Yves David
test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets...
r22067 > echo '------------------------------------------------------'
> cat ${TESTTMP}/check-commit.out
> echo
> fi
> done