Mercurial > hg
comparison tests/test-ssh.t @ 20501:8a9e0b523d2d
discovery: improve "note: unsynced remote changes!" warning
This message frequently caused confusion. "unsynced" is not a well established
user-facing concept in Mercurial and the message was not very specific or
helpful.
Instead, show a message like:
remote has heads on branch 'default' that are not known locally: 6c0482d977a3
This message will also (when relevant) be shown before aborting on "push
creates new remote head".
A similar (but actually very different) message was addressed in 6b618aa08b6e.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 06 Feb 2014 02:19:38 +0100 |
| parents | 47f25736d006 |
| children | d36440d84328 |
comparison
equal
deleted
inserted
replaced
| 20500:ce3f3082ec45 | 20501:8a9e0b523d2d |
|---|---|
| 221 push should succeed even though it has an unexpected response | 221 push should succeed even though it has an unexpected response |
| 222 | 222 |
| 223 $ hg push | 223 $ hg push |
| 224 pushing to ssh://user@dummy/remote | 224 pushing to ssh://user@dummy/remote |
| 225 searching for changes | 225 searching for changes |
| 226 note: unsynced remote changes! | 226 remote has heads on branch 'default' that are not known locally: 6c0482d977a3 |
| 227 remote: adding changesets | 227 remote: adding changesets |
| 228 remote: adding manifests | 228 remote: adding manifests |
| 229 remote: adding file changes | 229 remote: adding file changes |
| 230 remote: added 1 changesets with 1 changes to 1 files | 230 remote: added 1 changesets with 1 changes to 1 files |
| 231 remote: KABOOM | 231 remote: KABOOM |