Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-push-warn.out @ 2109:1b183976e007
Revert push new heads logic
This breaks push -r's new head detection but fixes the common case.
For now we'll assume that someone doing push -r knows what they're doing.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 21 Apr 2006 16:30:23 -0500 |
parents | fc22ed56afe3 |
children | b2ae81a7df29 |
line wrap: on
line diff
--- a/tests/test-push-warn.out +++ b/tests/test-push-warn.out @@ -30,9 +30,13 @@ searching for changes no changes found pushing to ../c searching for changes -abort: push creates new remote branches! -(did you forget to merge? use push -f to force) +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files (+2 heads) pushing to ../c searching for changes -abort: push creates new remote branches! -(did you forget to merge? use push -f to force) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files