← Back to team overview

kicad-developers team mailing list archive

Re: Fatfingering with bzr...


On 04/06/2012 02:19 PM, Solonen Vesa wrote:
> Cleaning the mess is in the works, but there are quite amusing things on the status log... It seems some of the revision info got lost and I don't know how to get it back.
> bzr merge -r 323..322 seems to do what it says, but I'm a bit reluctant to use it on the repo as it will delete stuff I didn't add. So I'm asking opinions whether I should just leave the mess behind and wait it to dry and stop stinking or revert r323 or do something else.
> -Vesa

I've never actually spoken to a librarian before.  Well I tried.  You are the first one
that speaks back, all the others only wanted to whisper.

I'm happy to defer to opinions of others on this.  I say the following without knowing
what happened, nor the current state of affairs, but, if it comes down to an emergency:

a) perhaps somebody has a better roll back point on their system.

b) the history is not as important as the most recent version, which needs to be what you
want it to be.


Follow ups