Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 1315:32f6cae83db7
Fix setting of hg default when using --pull on clone of local repository.
| author | Lee Cantey <lcantey@gmail.com> |
|---|---|
| date | Thu, 22 Sep 2005 09:47:27 -0700 |
| parents | d37a46859acd |
| children | 008d3666bf41 |
comparison
equal
deleted
inserted
replaced
| 1314:d37a46859acd | 1315:32f6cae83db7 |
|---|---|
| 628 d = Dircleanup(dest) | 628 d = Dircleanup(dest) |
| 629 abspath = source | 629 abspath = source |
| 630 other = hg.repository(ui, source) | 630 other = hg.repository(ui, source) |
| 631 | 631 |
| 632 copy = False | 632 copy = False |
| 633 if not opts['pull'] and other.dev() != -1: | 633 if other.dev() != -1: |
| 634 abspath = os.path.abspath(source) | 634 abspath = os.path.abspath(source) |
| 635 copy = True | 635 if not opts['pull']: |
| 636 | 636 copy = True |
| 637 | |
| 637 if copy: | 638 if copy: |
| 638 try: | 639 try: |
| 639 # we use a lock here because if we race with commit, we | 640 # we use a lock here because if we race with commit, we |
| 640 # can end up with extra data in the cloned revlogs that's | 641 # can end up with extra data in the cloned revlogs that's |
| 641 # not pointed to by changesets, thus causing verify to | 642 # not pointed to by changesets, thus causing verify to |