Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 3944:eb8ae9bfd5e2
Merge with mpm
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Wed, 20 Dec 2006 12:07:02 -0800 |
| parents | 7997c0e01bfc |
| children | 3d3007064a17 |
comparison
equal
deleted
inserted
replaced
| 3939:2ed46b6fc9fa | 3944:eb8ae9bfd5e2 |
|---|---|
| 1529 setremoteconfig(ui, opts) | 1529 setremoteconfig(ui, opts) |
| 1530 | 1530 |
| 1531 other = hg.repository(ui, source) | 1531 other = hg.repository(ui, source) |
| 1532 incoming = repo.findincoming(other, force=opts["force"]) | 1532 incoming = repo.findincoming(other, force=opts["force"]) |
| 1533 if not incoming: | 1533 if not incoming: |
| 1534 try: | |
| 1535 os.unlink(opts["bundle"]) | |
| 1536 except: | |
| 1537 pass | |
| 1534 ui.status(_("no changes found\n")) | 1538 ui.status(_("no changes found\n")) |
| 1535 return 1 | 1539 return 1 |
| 1536 | 1540 |
| 1537 cleanup = None | 1541 cleanup = None |
| 1538 try: | 1542 try: |