equal
deleted
inserted
replaced
626 if p1 != parents[0]: |
626 if p1 != parents[0]: |
627 p1 = parents[0] |
627 p1 = parents[0] |
628 p2 = repo[nullid] |
628 p2 = repo[nullid] |
629 except error.RepoError: |
629 except error.RepoError: |
630 p1, p2 = parents |
630 p1, p2 = parents |
|
631 if p2.node() == nullid: |
|
632 ui.warn(_("warning: import the patch as a normal revision\n" |
|
633 "(use --exact to import the patch as a merge)\n")) |
631 else: |
634 else: |
632 p1, p2 = parents |
635 p1, p2 = parents |
633 |
636 |
634 n = None |
637 n = None |
635 if update: |
638 if update: |