Mercurial > hg
diff tests/test-subrepo.out @ 10396:65a90c8e11ee
prepush: add more precise error messages
Part of the patch is from timeless@mozdev.org
- indicate the branch name where there are multiple heads
- give better advice when hitting a possible race, where new heads are added
between discovery and the call to branchmap(). In that case, asking the user
to merge isn't helpful, since only remote has the changes.
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Mon, 08 Feb 2010 19:44:04 +0100 |
| parents | e1401c74572f |
| children | ba5e508b5e92 |
line wrap: on
line diff
--- a/tests/test-subrepo.out Mon Feb 08 17:28:19 2010 +0100 +++ b/tests/test-subrepo.out Mon Feb 08 19:44:04 2010 +0100 @@ -151,7 +151,7 @@ added 1 changesets with 1 changes to 1 files % push -f committing subrepository s -abort: push creates new remote heads! +abort: push creates new remote heads on branch 'default'! pushing ...sub/t pushing ...subrepo ss searching for changes