Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 681:32b6bbf1c37b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sort files for removal
author Matt Mackall <mpm@selenic.com>
date Mon, 11 Jul 2005 15:07:04 -0800
parents 4b7b79d2db2c
children d7d68d27ebe5
comparison
equal deleted inserted replaced
680:4b7b79d2db2c 681:32b6bbf1c37b
1459 self.merge3(f, m, o) 1459 self.merge3(f, m, o)
1460 util.set_exec(self.wjoin(f), flag) 1460 util.set_exec(self.wjoin(f), flag)
1461 if moddirstate: 1461 if moddirstate:
1462 self.dirstate.update([f], 'm') 1462 self.dirstate.update([f], 'm')
1463 1463
1464 remove.sort()
1464 for f in remove: 1465 for f in remove:
1465 self.ui.note("removing %s\n" % f) 1466 self.ui.note("removing %s\n" % f)
1466 os.unlink(f) 1467 os.unlink(f)
1467 # try removing directories that might now be empty 1468 # try removing directories that might now be empty
1468 try: os.removedirs(os.path.dirname(f)) 1469 try: os.removedirs(os.path.dirname(f))