kicad-developers team mailing list archive

[Blair Bonnett <blair.bonnett@xxxxxxxxx>]

On 30 October 2013 09:52, Wayne Stambaugh <stambaughw@xxxxxxxxxxx> wrote:

> I apologize for the agonizing large number commits.  I performed a bzr
> pull from the cern branch to my local branch an some how it committed
> each change from that branch.  I don't understand how this happened.  If
> someone knows how to fix this off the top of their head, please let me
> know.  Otherwise, it's probably going to take a while to fix this mess.
>  In the mean time do not update your local branches or make any commits
> to the testing branch until I get this sorted out.
>
> Sorry,
>
> Wayne


I'm not a bazaar expert by any stretch of the imagination, so take the
following with a grain of salt.

Somebody asked a question on Stack Overflow about how to wipe revisions
containing confidential files accidentally commited. According to an answer:

    1.) bzr uncommit -r X              # Where X is the revision I want to
return to
    2.) bzr commit                        # This created the local revision
X+1
    3.) bzr push --overwrite -r X+1  # This pushed the stuff to launchpad,

  -- http://stackoverflow.com/a/9277254/668807

Apparently just doing the push --overwrite to revision X didn't work ("no
new revisions to push") though that was 18 months ago so things might have
changed.

I guess the thing to do would be test it on a copy of the screwed up branch
to remove the risk of making things worse...

Best of luck,
Blair