diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -276,6 +276,11 @@ def run_one(test, skips): hgrc = file(HGRCPATH, 'w+') hgrc.write('[ui]\n') hgrc.write('slash = True\n') + hgrc.write('[defaults]\n') + hgrc.write('backout = -d "0 0"\n') + hgrc.write('commit = -d "0 0"\n') + hgrc.write('debugrawcommit = -d "0 0"\n') + hgrc.write('tag = -d "0 0"\n') hgrc.close() err = os.path.join(TESTDIR, test+".err") diff --git a/tests/test-archive-symlinks b/tests/test-archive-symlinks --- a/tests/test-archive-symlinks +++ b/tests/test-archive-symlinks @@ -15,7 +15,8 @@ EOF hg init repo cd repo ln -s nothing dangling -hg ci -qAm 'add symlink' +# avoid tar warnings about old timestamp +hg ci -d '2000-01-01 00:00:00 +0000' -qAm 'add symlink' hg archive -t files ../archive hg archive -t tar -p tar ../archive.tar diff --git a/tests/test-tags b/tests/test-tags --- a/tests/test-tags +++ b/tests/test-tags @@ -116,13 +116,13 @@ hg init t4 cd t4 echo foo > foo hg add -hg ci -m 'add foo' -d '0 0' # rev 0 -hg tag -d '0 0' bar # rev 1 bar -> 0 -hg tag -d '0 0' -f bar # rev 2 bar -> 1 +hg ci -m 'add foo' # rev 0 +hg tag bar # rev 1 bar -> 0 +hg tag -f bar # rev 2 bar -> 1 hg up -qC 0 -hg tag -d '0 0' -fr 2 bar # rev 3 bar -> 2 +hg tag -fr 2 bar # rev 3 bar -> 2 hg tags hg up -qC 0 -hg tag -d '0 0' -m 'retag rev 0' -fr 0 bar # rev 4 bar -> 0, but bar stays at 2 +hg tag -m 'retag rev 0' -fr 0 bar # rev 4 bar -> 0, but bar stays at 2 echo % bar should still point to rev 2 hg tags