Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-backout @ 2158:ec96c4518236
add backout command.
command undoes effect of an earlier commit, commits new changeset
as result.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sat, 29 Apr 2006 20:56:46 -0700 |
parents | |
children | 1092533fd11c |
line wrap: on
line diff
new file mode 100755 --- /dev/null +++ b/tests/test-backout @@ -0,0 +1,51 @@ +#!/bin/sh + +echo '# basic operation' +hg init basic +cd basic +echo a > a +hg commit -d '0 0' -A -m a +echo b >> a +hg commit -d '1 0' -m b + +hg backout -d '2 0' tip +cat a + +echo '# file that was removed is recreated' +cd .. +hg init remove +cd remove + +echo content > a +hg commit -d '0 0' -A -m a + +hg rm a +hg commit -d '1 0' -m b + +hg backout -d '2 0' --merge tip +cat a + +echo '# backout of backout is as if nothing happened' + +hg backout -d '3 0' --merge tip +cat a + +echo '# backout with merge' +cd .. +hg init merge +cd merge + +echo line 1 > a +hg commit -d '0 0' -A -m a + +echo line 2 >> a +hg commit -d '1 0' -m b + +echo line 3 >> a +hg commit -d '2 0' -m c + +hg backout --merge -d '3 0' 1 +hg commit -d '4 0' -m d +cat a + +exit 0