equal
deleted
inserted
replaced
580 status = None |
580 status = None |
581 if checkout is not None: |
581 if checkout is not None: |
582 try: |
582 try: |
583 uprev = destrepo.lookup(checkout) |
583 uprev = destrepo.lookup(checkout) |
584 except error.RepoLookupError: |
584 except error.RepoLookupError: |
585 try: |
585 if update is not True: |
586 uprev = destrepo.lookup(update) |
586 try: |
587 except error.RepoLookupError: |
587 uprev = destrepo.lookup(update) |
588 pass |
588 except error.RepoLookupError: |
|
589 pass |
589 if uprev is None: |
590 if uprev is None: |
590 try: |
591 try: |
591 uprev = destrepo._bookmarks['@'] |
592 uprev = destrepo._bookmarks['@'] |
592 update = '@' |
593 update = '@' |
593 bn = destrepo[uprev].branch() |
594 bn = destrepo[uprev].branch() |