Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 13432:5a5bd7614401 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: break long line found by check-code
author Martin Geisler <mg@aragost.com>
date Thu, 17 Feb 2011 09:20:44 +0100
parents 5ef29e0dd418
children 64bb8e586a92
comparison
equal deleted inserted replaced
13431:69c773750055 13432:5a5bd7614401
884 self._gitcommand(['merge', '--no-commit', revision]) 884 self._gitcommand(['merge', '--no-commit', revision])
885 885
886 if self.dirty(): 886 if self.dirty():
887 if self._gitstate() != revision: 887 if self._gitstate() != revision:
888 dirty = self._gitstate() == self._state[1] or code != 0 888 dirty = self._gitstate() == self._state[1] or code != 0
889 if _updateprompt(self._ui, self, dirty, self._state[1][:7], revision[:7]): 889 if _updateprompt(self._ui, self, dirty,
890 self._state[1][:7], revision[:7]):
890 mergefunc() 891 mergefunc()
891 else: 892 else:
892 mergefunc() 893 mergefunc()
893 894
894 def push(self, force): 895 def push(self, force):