all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Is it possible to undo bzr pull --overwrite ?
@ 2013-06-10 20:52 Stephen Berman
       [not found] ` <871u89tza4.fsf@notengoamigos.org>
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Berman @ 2013-06-10 20:52 UTC (permalink / raw)
  To: emacs-devel

I wanted to update my local Emacs branch in which I develop the new
version of todo-mode.el that I just posted here, but unfortunately I
thoughtlessly used `bzr pull --overwrite' and now the entire history of
my package appears to be gone.  Is it possible to recover it?  A web
search found a suggestion to use `bzr heads --dead-only' and then `bzr
pull -rrevid:THEREVID .' and with the first command I found only the
revids of last change I made and one I made almost a year ago, but with
the second command, using the revid of the latest change, I only got
"bzr: ERROR: These branches have diverged. Use the missing command to
see how.  Use the merge command to reconcile them."  And `bzr missing'
just returns "Using saved parent location:
bzr+ssh://srb@bzr.savannah.gnu.org/emacs/trunk/ Branches are up to
date."  So have I irrevocably lost my local history, or can I still
recover it?

Steve Berman




^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Is it possible to undo bzr pull --overwrite ?
       [not found] ` <871u89tza4.fsf@notengoamigos.org>
@ 2013-06-10 22:14   ` Stephen Berman
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Berman @ 2013-06-10 22:14 UTC (permalink / raw)
  To: Jason Earl; +Cc: emacs-devel

[CCing emacs-devel for the record.]

On Mon, 10 Jun 2013 15:46:11 -0600 Jason Earl <jearl@notengoamigos.org> wrote:

> On Mon, Jun 10 2013, Stephen Berman wrote:
>
>> I wanted to update my local Emacs branch in which I develop the new
>> version of todo-mode.el that I just posted here, but unfortunately I
>> thoughtlessly used `bzr pull --overwrite' and now the entire history of
>> my package appears to be gone.  Is it possible to recover it?  A web
>> search found a suggestion to use `bzr heads --dead-only' and then `bzr
>> pull -rrevid:THEREVID .' and with the first command I found only the
>> revids of last change I made and one I made almost a year ago, but with
>> the second command, using the revid of the latest change, I only got
>> "bzr: ERROR: These branches have diverged.
>
> The fact that you have a dead head that corresponds with your last
> change is good news.  What you need now is a *new* branch--create it
> somewhere with bzr init.  The new branch does not have to be in the
> shared repository (although it will be much faster if it is).  Then cd
> to that branch and issue your pull.  It should look something like this:
>
> bzr pull -rrevid:THEREVID /path/to/borked/branch/

It worked -- thanks very much!  I feel a bit like I just recovered from
a supposedly incurable case of amnesia :-).

Steve Berman



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-06-10 22:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-10 20:52 Is it possible to undo bzr pull --overwrite ? Stephen Berman
     [not found] ` <871u89tza4.fsf@notengoamigos.org>
2013-06-10 22:14   ` Stephen Berman

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.