On 06/30/2010 11:47 AM, Dick Hollenbeck wrote: > On 06/30/2010 10:09 AM, Wayne Stambaugh wrote: > >> Dick, >> >> I just got the notification that your latest commit to the testing >> branch had removed last five revisions. I just checked and sure enough >> the last five commits got clobbered. It was at revision 2408 before you >> first commit which went in as 2404. This commit should have been >> revision 2409. Something has gone terribly wrong here. >> >> Wayne >> >> > Sorry, I am not sure what I did wrong, or even how to fix it. > > But I am looking into it now. > > It is actually quite alarming that anything could be done to clobber > more than the most recent commit. (BZR supports the uncommit command, > so I can understand losing one commit.) I am not clear on how 5 > revisions can vanish, even with user error. > > > Dick >
First before anyone panics, please see if the actual contents of changes have been lost, ignoring revision numbers. I have a full command line history intact, so I can tell accurately what I did. Here it is: 1) $ bzr status # make sure I had nothing uncommited 2) $ bzr merge # grab changes from lp:kicad (=testing) 3) $ bzr diff # show all changes 4) $ bzr log eeschema/dialog_edit_component_in_lib.cpp 5) $ bzr ci -m mainline-merges 6) @note: mark this spot for note below 7) $ bzr status 8) $ jedit eeschema/dialog_edit_component_in_schematic.cpp 9) $ bzr ci -m "fix comment to proper English" 10) $ bzr push At the @note I did an edit and a revert on one *fbp.cpp file, explicitly provided on command line, after I remembered that wxformbuilder edits this file. What is a better way for me to be using bzr? Dick _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
