Mercurial > hg
comparison mercurial/localrepo.py @ 6639:6334569c8caa
localrepo: fix partial merge test (issue 1111)
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Wed, 28 May 2008 22:45:07 +0200 |
| parents | 41eb20cc1c02 |
| children | 602f7c1ab954 |
comparison
equal
deleted
inserted
replaced
| 6638:5868d0b8509f | 6639:6334569c8caa |
|---|---|
| 785 if use_dirstate: | 785 if use_dirstate: |
| 786 p1, p2 = self.dirstate.parents() | 786 p1, p2 = self.dirstate.parents() |
| 787 update_dirstate = True | 787 update_dirstate = True |
| 788 | 788 |
| 789 if (not force and p2 != nullid and | 789 if (not force and p2 != nullid and |
| 790 (match.files() or match.anypats())): | 790 (match and (match.files() or match.anypats()))): |
| 791 raise util.Abort(_('cannot partially commit a merge ' | 791 raise util.Abort(_('cannot partially commit a merge ' |
| 792 '(do not specify files or patterns)')) | 792 '(do not specify files or patterns)')) |
| 793 else: | 793 else: |
| 794 p1, p2 = p1, p2 or nullid | 794 p1, p2 = p1, p2 or nullid |
| 795 update_dirstate = (self.dirstate.parents()[0] == p1) | 795 update_dirstate = (self.dirstate.parents()[0] == p1) |