Mercurial > hg
comparison hgext/mq.py @ 6558:550c53d66949
merge from crew-stable
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Wed, 16 Apr 2008 16:07:15 +0200 |
| parents | f2bd49752f0d 3182602fa1fb |
| children | 090f2145df7d |
comparison
equal
deleted
inserted
replaced
| 6557:f2bd49752f0d | 6558:550c53d66949 |
|---|---|
| 507 for f in merged: | 507 for f in merged: |
| 508 repo.dirstate.merge(f) | 508 repo.dirstate.merge(f) |
| 509 p1, p2 = repo.dirstate.parents() | 509 p1, p2 = repo.dirstate.parents() |
| 510 repo.dirstate.setparents(p1, merge) | 510 repo.dirstate.setparents(p1, merge) |
| 511 files = patch.updatedir(self.ui, repo, files) | 511 files = patch.updatedir(self.ui, repo, files) |
| 512 n = repo.commit(files, message, user, date, force=1) | 512 n = repo.commit(files, message, user, date, match=util.never, |
| 513 force=True) | |
| 513 | 514 |
| 514 if n == None: | 515 if n == None: |
| 515 raise util.Abort(_("repo commit failed")) | 516 raise util.Abort(_("repo commit failed")) |
| 516 | 517 |
| 517 if update_status: | 518 if update_status: |