Mercurial > hg > mercurial-crew-with-dirclash

comparison hgext/mq.py @ 2872:5dd6631c8238

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sat, 12 Aug 2006 16:05:09 -0700
parents b5f56d6c62c4 d36af1f10fdf
children 4ec58b157265
comparison
equal deleted inserted replaced
2870:ffa2be02c4e5 2872:5dd6631c8238
893 raise util.Abort("deletions found between repo revs") 893 raise util.Abort("deletions found between repo revs")
894 for f in c: 894 for f in c:
895 getfile(f, mmap[f]) 895 getfile(f, mmap[f])
896 for f in r: 896 for f in r:
897 getfile(f, mmap[f]) 897 getfile(f, mmap[f])
898 util.set_exec(repo.wjoin(f), mmap.execf[f]) 898 util.set_exec(repo.wjoin(f), mmap.execf(f))
899 repo.dirstate.update(c + r, 'n') 899 repo.dirstate.update(c + r, 'n')
900 for f in a: 900 for f in a:
901 try: os.unlink(repo.wjoin(f)) 901 try: os.unlink(repo.wjoin(f))
902 except: raise 902 except: raise
903 try: os.removedirs(os.path.dirname(repo.wjoin(f))) 903 try: os.removedirs(os.path.dirname(repo.wjoin(f)))