##// END OF EJS Templates
pr-shadow: Set bookmark in hg repositories on successful merge. #1055
Martin Bornhold -
r1040:1f1d5ef7 default
parent child Browse files
Show More
@@ -701,6 +701,11 b' class MercurialRepository(BaseRepository'
701 701 target_ref, merge_message, merger_name, merger_email,
702 702 source_ref, use_rebase=use_rebase)
703 703 merge_possible = True
704
705 # Set a bookmark pointing to the merge commit. This bookmark may be
706 # used to easily identify the last successful merge commit in the
707 # shadow repository.
708 shadow_repo.bookmark('pr-merge', revision=merge_commit_id)
704 709 except RepositoryError as e:
705 710 log.exception('Failure when doing local merge on hg shadow repo')
706 711 merge_possible = False
@@ -737,9 +742,6 b' class MercurialRepository(BaseRepository'
737 742 else:
738 743 merge_succeeded = False
739 744
740 if dry_run:
741 merge_commit_id = None
742
743 745 return MergeResponse(
744 746 merge_possible, merge_succeeded, merge_commit_id,
745 747 merge_failure_reason)
General Comments 0
You need to be logged in to leave comments. Login now