Mercurial > hg
diff tests/test-push-warn.out @ 9479:f3569d95c2ab
push: fix subtle bug in prepush logic
A test case demonstrating the bug has been added.
Contributed by Henrik Stuart and Sune Foldager.
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Wed, 23 Sep 2009 18:56:09 +0200 |
parents | 268d16b2ec25 |
children | aa404f3f661b |
line wrap: on
line diff
--- a/tests/test-push-warn.out Wed Sep 23 15:51:36 2009 +0200 +++ b/tests/test-push-warn.out Wed Sep 23 18:56:09 2009 +0200 @@ -124,3 +124,20 @@ adding file changes added 2 changesets with 2 changes to 1 files 0 +% checking prepush logic does not allow silently pushing multiple new heads +abort: repository g already exists! +adding init +adding a +updating working directory +3 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 2 files removed, 0 files unresolved +adding b +created new head +1 files updated, 0 files merged, 2 files removed, 0 files unresolved +adding c +created new head +pushing to g +searching for changes +abort: push creates new remote heads! +(did you forget to merge? use push -f to force) +