equal
deleted
inserted
replaced
803 tr = repo.transaction('relocate') |
803 tr = repo.transaction('relocate') |
804 try: |
804 try: |
805 try: |
805 try: |
806 if repo['.'].rev() != dest.rev(): |
806 if repo['.'].rev() != dest.rev(): |
807 merge.update(repo, dest, False, True, False) |
807 merge.update(repo, dest, False, True, False) |
|
808 if repo._bookmarkcurrent: |
|
809 repo.ui.status(_("(leaving bookmark %s)\n") % |
|
810 repo._bookmarkcurrent) |
|
811 bookmarks.unsetcurrent(repo) |
808 if keepbranch: |
812 if keepbranch: |
809 repo.dirstate.setbranch(orig.branch()) |
813 repo.dirstate.setbranch(orig.branch()) |
810 r = merge.graft(repo, orig, orig.p1(), ['local', 'graft']) |
814 r = merge.graft(repo, orig, orig.p1(), ['local', 'graft']) |
811 if r[-1]: #some conflict |
815 if r[-1]: #some conflict |
812 raise util.Abort( |
816 raise util.Abort( |