Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/hg.py @ 8814:ab668c92a036

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: add update/merge logic
author Matt Mackall <mpm@selenic.com>
date Mon, 15 Jun 2009 02:45:38 -0500
parents 8bf6eb68ddaf
children e9ef409e6399
comparison
equal deleted inserted replaced
8813:db3c1ab0e632 8814:ab668c92a036
295 fp = dest_repo.opener("hgrc", "w", text=True) 295 fp = dest_repo.opener("hgrc", "w", text=True)
296 fp.write("[paths]\n") 296 fp.write("[paths]\n")
297 fp.write("default = %s\n" % abspath) 297 fp.write("default = %s\n" % abspath)
298 fp.close() 298 fp.close()
299 299
300 dest_repo.ui.setconfig('paths', 'default', abspath)
301
300 if update: 302 if update:
301 dest_repo.ui.status(_("updating working directory\n")) 303 dest_repo.ui.status(_("updating working directory\n"))
302 if update is not True: 304 if update is not True:
303 checkout = update 305 checkout = update
304 for test in (checkout, 'default', 'tip'): 306 for test in (checkout, 'default', 'tip'):