Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 4379:f4af7960d578

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bad reference to RepoError in import command
author Joel Rosdahl <joel@rosdahl.net>
date Sat, 28 Apr 2007 16:28:54 +0200
parents de612b5f8d59
children 28054fc34923
comparison
equal deleted inserted replaced
4374:de612b5f8d59 4379:f4af7960d578
1548 try: 1548 try:
1549 p1 = repo.lookup(p1) 1549 p1 = repo.lookup(p1)
1550 p2 = repo.lookup(p2) 1550 p2 = repo.lookup(p2)
1551 if p1 == wp[0].node(): 1551 if p1 == wp[0].node():
1552 repo.dirstate.setparents(p1, p2) 1552 repo.dirstate.setparents(p1, p2)
1553 except RepoError: 1553 except hg.RepoError:
1554 pass 1554 pass
1555 1555
1556 files = {} 1556 files = {}
1557 try: 1557 try:
1558 fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root, 1558 fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root,