diff options
| author |   nicm <nicm@openbsd.org> | 2010-07-13 20:47:56 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-07-13 20:47:56 +0000 |
| commit | 21d02a4b95bf7f266afa5587c336056d0cff37cb (patch) | |
| tree | 1fe56d78cdf7aac425ab2aa5ad92c841c558b396 | |
| parent | Do not put the file into conflict if it is no longer modified (user has (diff) | |
| download | wireguard-openbsd-21d02a4b95bf7f266afa5587c336056d0cff37cb.tar.xz wireguard-openbsd-21d02a4b95bf7f266afa5587c336056d0cff37cb.zip | |
regress for merge bug.
| -rw-r--r-- | regress/usr.bin/cvs/Makefile | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/regress/usr.bin/cvs/Makefile b/regress/usr.bin/cvs/Makefile index 2bac00db0c1..96e2081a0dc 100644 --- a/regress/usr.bin/cvs/Makefile +++ b/regress/usr.bin/cvs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2008/03/10 20:03:21 tobias Exp $ +# $OpenBSD: Makefile,v 1.27 2010/07/13 20:47:56 nicm Exp $ # Regression tests by Niall O'Higgins <niallo@openbsd.org> and # Tobias Stoeckmann <tobias@openbsd.org>. @@ -65,7 +65,8 @@ LTESTS= cvs-initial \ cvs-log \ cvs-rlog \ cvs-rtag-one_more_branch \ - cvs-export + cvs-export \ + cvs-merge # Known to fail. # cvs-update-for_subdir # cvs-release-dflag @@ -305,6 +306,20 @@ test-cvs-update-for_subdir: test ! -f ${REGRESS_SEED}/seed1.txt && \ test ! -f ${REGRESS_SEED}/seed2.txt +test-cvs-merge: + @rm -rf ${REGRESS_WCOPY} + @mkdir -p ${REGRESS_WCOPY}/a ${REGRESS_WCOPY}/b + @cd ${REGRESS_WCOPY}/a; \ + ${CVSCMD} -Q -d ${MYCVSROOT} co seed > /dev/null + @cd ${REGRESS_WCOPY}/b; \ + ${CVSCMD} -Q -d ${MYCVSROOT} co seed > /dev/null + @echo "modified text" > ${REGRESS_WCOPY}/a/seed/seed1.txt + @cd ${REGRESS_WCOPY}/a/seed && ${CVSCMD} -Q com -m 'a' > /dev/null + @echo "modified text 2" > ${REGRESS_WCOPY}/b/seed/seed1.txt + @cd ${REGRESS_WCOPY}/b/seed && ${CVSCMD} -Q up > /dev/null 2>&1 + @echo "modified text" > ${REGRESS_WCOPY}/b/seed/seed1.txt + @cd ${REGRESS_WCOPY}/b/seed && test `${CVSCMD} -q up | wc -l` -eq 0 + clean: @rm -rf ${CLEANFILES} |