Mercurial > hg
comparison tests/test-push-warn.out @ 10771:01f097c4ae66 stable
push: fix bug in prepush logic and its tests
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Fri, 26 Mar 2010 17:02:36 +0100 |
parents | 65a90c8e11ee |
children | a9702c47a19f |
comparison
equal
deleted
inserted
replaced
10770:fe39f0160c74 | 10771:01f097c4ae66 |
---|---|
98 abort: push creates new remote branches: c, d! | 98 abort: push creates new remote branches: c, d! |
99 (use 'hg push -f' to force) | 99 (use 'hg push -f' to force) |
100 1 | 100 1 |
101 pushing to ../f | 101 pushing to ../f |
102 searching for changes | 102 searching for changes |
103 abort: push creates new remote branches: d! | 103 abort: push creates new remote branches: c, d! |
104 (use 'hg push -f' to force) | 104 (use 'hg push -f' to force) |
105 1 | 105 1 |
106 % fail on multiple head push | 106 % fail on multiple head push |
107 pushing to ../f | 107 pushing to ../f |
108 searching for changes | 108 searching for changes |
165 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 165 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
166 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 166 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
167 (branch merge, don't forget to commit) | 167 (branch merge, don't forget to commit) |
168 pushing to j | 168 pushing to j |
169 searching for changes | 169 searching for changes |
170 abort: push creates new remote branches: b! | |
171 (use 'hg push -f' to force) | |
172 | |
173 % prepush -r should not allow you to sneak in new heads | |
174 pushing to ../l | |
175 searching for changes | |
170 abort: push creates new remote heads on branch 'a'! | 176 abort: push creates new remote heads on branch 'a'! |
171 (you should pull and merge or use push -f to force) | 177 (did you forget to merge? use push -f to force) |
172 |