protected void OnMerge() { VersionControlItem vcitem = GetItems()[0]; MercurialRepository repo = ((MercurialRepository)vcitem.Repository); repo.Merge(); } // OnMerge
public static void ShowMergeDialog(MercurialRepository repo, bool rebasing) { MergeDialog dlg = new MergeDialog(repo, rebasing); try { if (MessageService.RunCustomDialog(dlg) == (int)Gtk.ResponseType.Ok) { dlg.Hide(); using (IProgressMonitor monitor = VersionControlService.GetProgressMonitor(GettextCatalog.GetString("Merging branch '{0}'...", dlg.SelectedBranch))) { repo.Merge(dlg.SelectedBranch, dlg.StageChanges, monitor); } } } finally { dlg.Destroy(); } }
public static void ShowMergeDialog(MercurialRepository repo, bool rebasing) { MergeDialog dlg = new MergeDialog (repo, rebasing); try { if (MessageService.RunCustomDialog (dlg) == (int) Gtk.ResponseType.Ok) { dlg.Hide (); using (IProgressMonitor monitor = VersionControlService.GetProgressMonitor (GettextCatalog.GetString ("Merging branch '{0}'...", dlg.SelectedBranch))) { repo.Merge (dlg.SelectedBranch, dlg.StageChanges, monitor); } } } finally { dlg.Destroy (); } }