Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
9475:c295a82a020b | 9479:f3569d95c2ab |
---|---|
122 adding changesets | 122 adding changesets |
123 adding manifests | 123 adding manifests |
124 adding file changes | 124 adding file changes |
125 added 2 changesets with 2 changes to 1 files | 125 added 2 changesets with 2 changes to 1 files |
126 0 | 126 0 |
127 % checking prepush logic does not allow silently pushing multiple new heads | |
128 abort: repository g already exists! | |
129 adding init | |
130 adding a | |
131 updating working directory | |
132 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
133 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
134 adding b | |
135 created new head | |
136 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
137 adding c | |
138 created new head | |
139 pushing to g | |
140 searching for changes | |
141 abort: push creates new remote heads! | |
142 (did you forget to merge? use push -f to force) | |
143 |