Ejemplo n.º 1
0
        protected override void OnRevertRevision(FilePath localPath, Revision revision, IProgressMonitor monitor)
        {
            if (IsModified(BazaarRepository.GetLocalBasePath(localPath)))
            {
                MessageDialog md = new MessageDialog(null, DialogFlags.Modal,
                                                     MessageType.Question, ButtonsType.YesNo,
                                                     GettextCatalog.GetString("You have uncommitted local changes. Revert anyway?"));
                try
                {
                    if ((int)ResponseType.Yes != md.Run())
                    {
                        return;
                    }
                }
                finally
                {
                    md.Destroy();
                }
            }

            BazaarRevision brev         = (BazaarRevision)revision;
            string         localPathStr = localPath.FullPath;

            Bazaar.Merge(localPathStr, localPathStr, false, true, brev, (BazaarRevision)(brev.GetPrevious()), monitor);
        }
Ejemplo n.º 2
0
 public virtual void Merge(string mergeLocation, FilePath localPath, bool remember, bool overwrite, IProgressMonitor monitor)
 {
     Bazaar.StoreCredentials(mergeLocation);
     Bazaar.Merge(mergeLocation, localPath.FullPath, remember, overwrite, new BazaarRevision(this, BazaarRevision.NONE), new BazaarRevision(this, BazaarRevision.NONE), monitor);
 }