Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/localrepo.py @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 03 Jul 2006 19:14:29 +0200 |
| parents | ffde9eb23f59 |
| children | 764a54eb8c5a |
comparison
equal
deleted
inserted
replaced
| 2547:d75c68b55af8 | 2548:0229ff95faec |
|---|---|
| 1641 # is this a jump, or a merge? i.e. is there a linear path | 1641 # is this a jump, or a merge? i.e. is there a linear path |
| 1642 # from p1 to p2? | 1642 # from p1 to p2? |
| 1643 linear_path = (pa == p1 or pa == p2) | 1643 linear_path = (pa == p1 or pa == p2) |
| 1644 | 1644 |
| 1645 if allow and linear_path: | 1645 if allow and linear_path: |
| 1646 raise util.Abort(_("there is nothing to merge, " | 1646 raise util.Abort(_("there is nothing to merge, just use " |
| 1647 "just use 'hg update'")) | 1647 "'hg update' or look at 'hg heads'")) |
| 1648 if allow and not forcemerge: | 1648 if allow and not forcemerge: |
| 1649 if modified or added or removed: | 1649 if modified or added or removed: |
| 1650 raise util.Abort(_("outstanding uncommitted changes")) | 1650 raise util.Abort(_("outstanding uncommitted changes")) |
| 1651 | 1651 |
| 1652 if not forcemerge and not force: | 1652 if not forcemerge and not force: |