Mercurial > evolve
comparison hgext/evolve.py @ 948:b2b3d5aa16bc stable
evolve: start all util.Abort messages with lower case
| author | Angel Ezquerra <angel.ezquerra@gmail.com> |
|---|---|
| date | Tue, 29 Apr 2014 22:25:48 +0200 |
| parents | 9a6cc7e6f0dd |
| children | 2b2a4ab0eb68 |
comparison
equal
deleted
inserted
replaced
| 947:9a6cc7e6f0dd | 948:b2b3d5aa16bc |
|---|---|
| 1194 "| - hg touch -D\n" | 1194 "| - hg touch -D\n" |
| 1195 "| - hg prune\n" | 1195 "| - hg prune\n" |
| 1196 "| \n" | 1196 "| \n" |
| 1197 "| You should contact your local evolution Guru for help.\n" | 1197 "| You should contact your local evolution Guru for help.\n" |
| 1198 % (divergent, othersstr)) | 1198 % (divergent, othersstr)) |
| 1199 raise util.Abort("We do not handle divergence with split yet", | 1199 raise util.Abort("we do not handle divergence with split yet", |
| 1200 hint='') | 1200 hint='') |
| 1201 other = others[0] | 1201 other = others[0] |
| 1202 if divergent.phase() <= phases.public: | 1202 if divergent.phase() <= phases.public: |
| 1203 raise util.Abort("We can't resolve this conflict from the public side", | 1203 raise util.Abort("we can't resolve this conflict from the public side", |
| 1204 hint="%s is public, try from %s" % (divergent, other)) | 1204 hint="%s is public, try from %s" % (divergent, other)) |
| 1205 if len(other.parents()) > 1: | 1205 if len(other.parents()) > 1: |
| 1206 raise util.Abort("divergent changeset can't be a merge (yet)", | 1206 raise util.Abort("divergent changeset can't be a merge (yet)", |
| 1207 hint="You have to fallback to solving this by hand...\n" | 1207 hint="You have to fallback to solving this by hand...\n" |
| 1208 "| This probably means redoing the merge and using " | 1208 "| This probably means redoing the merge and using " |