Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
348:442eb02cf870 | 349:b2293093b89e |
---|---|
336 self.ignorelist = None | 336 self.ignorelist = None |
337 self.tags = None | 337 self.tags = None |
338 | 338 |
339 if not self.remote: | 339 if not self.remote: |
340 self.dirstate = dirstate(self.opener, ui, self.root) | 340 self.dirstate = dirstate(self.opener, ui, self.root) |
341 try: | |
342 self.ui.readconfig(self.opener("hgrc")) | |
343 except IOError: pass | |
341 | 344 |
342 def ignore(self, f): | 345 def ignore(self, f): |
343 if self.ignorelist is None: | 346 if self.ignorelist is None: |
344 self.ignorelist = [] | 347 self.ignorelist = [] |
345 try: | 348 try: |