Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 10395:ea52a2d4f42c | 10396:65a90c8e11ee |
|---|---|
| 149 adding manifests | 149 adding manifests |
| 150 adding file changes | 150 adding file changes |
| 151 added 1 changesets with 1 changes to 1 files | 151 added 1 changesets with 1 changes to 1 files |
| 152 % push -f | 152 % push -f |
| 153 committing subrepository s | 153 committing subrepository s |
| 154 abort: push creates new remote heads! | 154 abort: push creates new remote heads on branch 'default'! |
| 155 pushing ...sub/t | 155 pushing ...sub/t |
| 156 pushing ...subrepo ss | 156 pushing ...subrepo ss |
| 157 searching for changes | 157 searching for changes |
| 158 no changes found | 158 no changes found |
| 159 pushing ...subrepo s | 159 pushing ...subrepo s |