Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/filemerge.py @ 27164:88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
It makes far more sense to leave these conflicts unresolved and kick back to
the user than to just assume that the local version be chosen. There are almost
certainly buggy scripts and applications using Mercurial in the wild that do
merges or rebases non-interactively, and then assume that if the operation
succeeded there's nothing the user needs to pay attention to.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Tue, 01 Dec 2015 09:48:38 -0800 |
| parents | 27b89a0957ec |
| children | ad5966de3c9a |
comparison
equal
deleted
inserted
replaced
| 27163:27b89a0957ec | 27164:88d5db4b155c |
|---|---|
| 251 choice = ['other', 'local', 'unresolved'][index] | 251 choice = ['other', 'local', 'unresolved'][index] |
| 252 else: | 252 else: |
| 253 index = ui.promptchoice( | 253 index = ui.promptchoice( |
| 254 _("no tool found to merge %s\n" | 254 _("no tool found to merge %s\n" |
| 255 "keep (l)ocal, take (o)ther, or leave (u)nresolved?" | 255 "keep (l)ocal, take (o)ther, or leave (u)nresolved?" |
| 256 "$$ &Local $$ &Other $$ &Unresolved") % fd, 0) | 256 "$$ &Local $$ &Other $$ &Unresolved") % fd, 2) |
| 257 choice = ['local', 'other', 'unresolved'][index] | 257 choice = ['local', 'other', 'unresolved'][index] |
| 258 | 258 |
| 259 if choice == 'other': | 259 if choice == 'other': |
| 260 return _iother(repo, mynode, orig, fcd, fco, fca, toolconf) | 260 return _iother(repo, mynode, orig, fcd, fco, fca, toolconf) |
| 261 elif choice == 'local': | 261 elif choice == 'local': |