# HG changeset patch # User Brendan Cully # Date 1151108464 25200 # Node ID 2f4addf56715c543078cf979897703c36d41f8ef # Parent ffde9eb23f592534e5ac11f1bbf779ea117c052d Test case for #295 diff --git a/tests/test-backout b/tests/test-backout --- a/tests/test-backout +++ b/tests/test-backout @@ -48,4 +48,16 @@ hg backout --merge -d '3 0' 1 hg commit -d '4 0' -m d cat a +echo '# backout should not back out subsequent changesets' +hg init onecs +cd onecs +echo 1 > a +hg commit -d '0 0' -A -m a +echo 2 >> a +hg commit -d '1 0' -m b +echo 1 > b +hg commit -d '2 0' -A -m c +hg backout -d '3 0' 1 +hg locate b + exit 0 diff --git a/tests/test-backout.out b/tests/test-backout.out --- a/tests/test-backout.out +++ b/tests/test-backout.out @@ -21,3 +21,9 @@ merging a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) line 1 +# backout should not back out subsequent changesets +adding a +adding b +reverting a +changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5 +b