Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 4593:2937d0dbfab0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make --import-branch option actually work (- is translated to _)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 17 Jun 2007 14:11:30 +0200
parents 5243cece3d97
children e69da61e467e
comparison
equal deleted inserted replaced
4592:5243cece3d97 4593:2937d0dbfab0
1520 p2 = repo.lookup(p2) 1520 p2 = repo.lookup(p2)
1521 if p1 == wp[0].node(): 1521 if p1 == wp[0].node():
1522 repo.dirstate.setparents(p1, p2) 1522 repo.dirstate.setparents(p1, p2)
1523 except hg.RepoError: 1523 except hg.RepoError:
1524 pass 1524 pass
1525 if opts.get('exact') or opts.get('import-branch'): 1525 if opts.get('exact') or opts.get('import_branch'):
1526 repo.dirstate.setbranch(branch or 'default') 1526 repo.dirstate.setbranch(branch or 'default')
1527 1527
1528 files = {} 1528 files = {}
1529 try: 1529 try:
1530 fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root, 1530 fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root,