Mercurial > public > mercurial-scm > hg
diff mercurial/hg.py @ 349:b2293093b89e
Merged with mercurial-identify (which includes upstream's current tip)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merged with mercurial-identify (which includes upstream's current tip)
manifest hash: b135d201757b84bbe7f14a446d2b001fd0cc1aa2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCr9mNW7P1GVgWeRoRAmTjAJ919wnvZXbKI27N0cDJCrumR3z4rQCcD6PO
yZTmrT6p+gt6GBO+j5FVBn0=
=HWn8
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 15 Jun 2005 08:32:29 +0100 |
parents | 27d08c0c2a7e c3d873ef4b31 |
children | b4e0e20646bb |
line wrap: on
line diff
--- a/mercurial/hg.py Tue Jun 14 08:49:52 2005 +0100 +++ b/mercurial/hg.py Wed Jun 15 08:32:29 2005 +0100 @@ -338,6 +338,9 @@ if not self.remote: self.dirstate = dirstate(self.opener, ui, self.root) + try: + self.ui.readconfig(self.opener("hgrc")) + except IOError: pass def ignore(self, f): if self.ignorelist is None: