Mercurial > hg
comparison tests/test-merge-closedheads.t @ 43114:8197b395710e
destutil: provide hint on rebase+merge for how to specify destination/rev
Without a destination specified, rebase and merge attempt to identify a good
candidate; this fails if there's too many heads, the heads have a bookmark, or
other reasons.
Complicating the issue, users may have specified -t, thinking it means target,
and are confused when the error message says that they need to specify an
explicit rev or explicit destination - they feel like they already have.
Differential Revision: https://phab.mercurial-scm.org/D7024
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Tue, 08 Oct 2019 19:35:30 -0700 |
| parents | f2719b387380 |
| children |
comparison
equal
deleted
inserted
replaced
| 43113:37af48031d6f | 43114:8197b395710e |
|---|---|
| 41 fail with three heads | 41 fail with three heads |
| 42 $ hg up -C good | 42 $ hg up -C good |
| 43 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 43 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 44 $ hg merge | 44 $ hg merge |
| 45 abort: branch 'default' has 3 heads - please merge with an explicit rev | 45 abort: branch 'default' has 3 heads - please merge with an explicit rev |
| 46 (run 'hg heads .' to see heads) | 46 (run 'hg heads .' to see heads, specify rev with -r) |
| 47 [255] | 47 [255] |
| 48 | 48 |
| 49 close one of the heads | 49 close one of the heads |
| 50 $ hg up -C 6 | 50 $ hg up -C 6 |
| 51 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 51 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |