Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 2861:1f813d4fbcc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bad merge with crew
author Brendan Cully <brendan@kublai.com>
date Fri, 11 Aug 2006 16:30:24 -0700
parents 0f08f2c042ec
children 71e78f2ca5ae
comparison
equal deleted inserted replaced
2860:0f08f2c042ec 2861:1f813d4fbcc8
1823 '(---|\*\*\*)[ \t])', re.MULTILINE) 1823 '(---|\*\*\*)[ \t])', re.MULTILINE)
1824 1824
1825 wlock = repo.wlock() 1825 wlock = repo.wlock()
1826 lock = repo.lock() 1826 lock = repo.lock()
1827 1827
1828 wlock = repo.wlock()
1829 for p in patches: 1828 for p in patches:
1830 pf = os.path.join(d, p) 1829 pf = os.path.join(d, p)
1831 1830
1832 message = None 1831 message = None
1833 user = None 1832 user = None