Mercurial > hg
comparison mercurial/subrepo.py @ 9049:38b5d5e0efab
filemerge, subrepo: correct indention
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Tue, 07 Jul 2009 17:26:20 +0200 |
| parents | 86b4a9b0ddda |
| children | 9aebeea7ac00 |
comparison
equal
deleted
inserted
replaced
| 9048:86b4a9b0ddda | 9049:38b5d5e0efab |
|---|---|
| 80 wctx.sub(s).remove() | 80 wctx.sub(s).remove() |
| 81 else: | 81 else: |
| 82 if repo.ui.promptchoice( | 82 if repo.ui.promptchoice( |
| 83 _(' local changed subrepository %s which remote removed\n' | 83 _(' local changed subrepository %s which remote removed\n' |
| 84 'use (c)hanged version or (d)elete?') % s, | 84 'use (c)hanged version or (d)elete?') % s, |
| 85 (_('&Changed'), _('&Delete')), 0): | 85 (_('&Changed'), _('&Delete')), 0): |
| 86 wctx.sub(s).remove() | 86 wctx.sub(s).remove() |
| 87 | 87 |
| 88 for s, r in s2.items(): | 88 for s, r in s2.items(): |
| 89 if s in s1: | 89 if s in s1: |
| 90 continue | 90 continue |
| 93 sm[s] = r | 93 sm[s] = r |
| 94 elif r != sa[s]: | 94 elif r != sa[s]: |
| 95 if repo.ui.promptchoice( | 95 if repo.ui.promptchoice( |
| 96 _(' remote changed subrepository %s which local removed\n' | 96 _(' remote changed subrepository %s which local removed\n' |
| 97 'use (c)hanged version or (d)elete?') % s, | 97 'use (c)hanged version or (d)elete?') % s, |
| 98 (_('&Changed'), _('&Delete')), 0) == 0: | 98 (_('&Changed'), _('&Delete')), 0) == 0: |
| 99 wctx.sub(s).get(r) | 99 wctx.sub(s).get(r) |
| 100 sm[s] = r | 100 sm[s] = r |
| 101 | 101 |
| 102 # record merged .hgsubstate | 102 # record merged .hgsubstate |
| 103 writestate(repo, sm) | 103 writestate(repo, sm) |