[M3devel] github history

[Jay K]

  I don't really know what I'm doing with git. And it seems dangerous.  
 
 
  I do know what I'm doing with Perforce, but oh well. 
 
 
  I am a big fan of preserving history, so if I lost any, you can assume it was an accident.
    (That said, "local history" on my machine maybe isn't so valuable, noisy.)
 
 
  I really don't understand git merging. I tried using stash when there was a conflict, and that didn't go well.
 
 
  I don't know how to have multiple "checkouts" w/o multiple repositories. Wasteful.
   The web suggests some ways, but they didn't work for me -- e.g. cloning a local; I couldn't push from that.
  I gave up and created another large local repository. At least it was easy and fast enough.
 
 
  I don't want little temporary branches for this -- I don't want my one working directory to bounce between branches,
  I want multiple independent working directories against the same branch.
 
 
 - Jay

 
Subject: Re: github history
From: hosking at purdue.edu
Date: Thu, 27 Aug 2015 14:54:57 +1000
CC: m3devel at elegosoft.com; jay.krell at cornell.edu; dragisha at m3w.org
To: hosking at purdue.edu

Update:
I have successfully brought back history by:
1. setting the default branch to our old trunk,2. merging from master,3. deleting master,4. branching a new master from the (up-to-date) trunk, and5. setting the default branch back to master.
On Aug 27, 2015, at 1:46 PM, Antony Hosking <hosking at purdue.edu> wrote:PS Jay, in poking around on github it seems that the source of this weirdness is a merge you did earlier this year.  I suspect you were not using proper github workflow and it messed up the history (perhaps you inverted the merge?).  Does anyone out there have better github fu than I do, who can dig into this and try to repair?  Dragisha?
On Aug 27, 2015, at 1:14 PM, Antony Hosking <hosking at purdue.edu> wrote:I am dismayed to find that the full commit histories on github do not appear to have made it over from the transition from svn to github.  For example, I find the following very abbreviated history in the master tree for NilChkExpr.m3 in package m3front (see below).  Did something strange happen in a merge somewhere along the way from the initial import into github?  It looks like it occurred at the time  of the commit "jaykrell on Jan 4, 2008 initial diff from ../config/PPC_LINUX" when it looks like the master got clobbered somehow.  Anyone have any ideas if we can recover?
Commits on May 4, 2008<1635728.png>add more information printed for some assertion failures .jaykrell authored on May 4, 200866139d4 Commits on Jan 4, 2008<1635728.png>initial diff from ../config/PPC_LINUXjaykrell authored on Jan 4, 20082412437 


 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://m3lists.elegosoft.com/pipermail/m3devel/attachments/20150828/b0bb35fd/attachment-0001.html>