<html>
<head>
<style><!--
.hmmessage P
{
margin:0px;
padding:0px
}
body.hmmessage
{
font-size: 12pt;
font-family:Calibri
}
--></style></head>
<body class='hmmessage'><div dir='ltr'> I don't really know what I'm doing with git. And it seems dangerous. <BR> <BR> <BR> I do know what I'm doing with Perforce, but oh well. <BR> <BR> <BR> I am a big fan of preserving history, so if I lost any, you can assume it was an accident.<BR> (That said, "local history" on my machine maybe isn't so valuable, noisy.)<BR> <BR> <BR> I really don't understand git merging. I tried using stash when there was a conflict, and that didn't go well.<BR> <BR> <BR> I don't know how to have multiple "checkouts" w/o multiple repositories. Wasteful.<BR> The web suggests some ways, but they didn't work for me -- e.g. cloning a local; I couldn't push from that.<BR> I gave up and created another large local repository. At least it was easy and fast enough.<BR> <BR> <BR> I don't want little temporary branches for this -- I don't want my one working directory to bounce between branches,<BR> I want multiple independent working directories against the same branch.<BR> <BR> <BR> - Jay<br><br> <BR><div><hr id="stopSpelling">Subject: Re: github history<br>From: hosking@purdue.edu<br>Date: Thu, 27 Aug 2015 14:54:57 +1000<br>CC: m3devel@elegosoft.com; jay.krell@cornell.edu; dragisha@m3w.org<br>To: hosking@purdue.edu<br><br><div>Update:</div><div><br></div><div>I have successfully brought back history by:</div><div><br></div><div>1. setting the default branch to our old trunk,</div><div>2. merging from master,</div><div>3. deleting master,</div><div>4. branching a new master from the (up-to-date) trunk, and</div><div>5. setting the default branch back to master.</div><br><div><blockquote><div>On Aug 27, 2015, at 1:46 PM, Antony Hosking <<a href="mailto:hosking@purdue.edu">hosking@purdue.edu</a>> wrote:</div><br class="ecxApple-interchange-newline"><div><div style="-ms-word-wrap: break-word;">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?<div><br><div><blockquote><div>On Aug 27, 2015, at 1:14 PM, Antony Hosking <<a href="mailto:hosking@purdue.edu">hosking@purdue.edu</a>> wrote:</div><br class="ecxApple-interchange-newline"><div><div style="-ms-word-wrap: break-word;">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?<div><br></div><div><div class="ecxcommit-group-title" style='color: rgb(118, 118, 118); line-height: 18px; font-family: Helvetica, arial, nimbussansl, liberationsans, freesans, clean, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol"; font-size: 13px; box-sizing: border-box;'>Commits on May 4, 2008</div><ol class="ecxcommit-group ecxtable-list ecxtable-list-bordered" style='padding: 0px; width: 881px; color: rgb(153, 153, 153); line-height: 18px; font-family: Helvetica, arial, nimbussansl, liberationsans, freesans, clean, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol"; font-size: 13px; border-bottom-color: rgb(229, 229, 229); border-bottom-width: 1px; border-bottom-style: solid; display: table; list-style-type: none; table-layout: fixed; box-sizing: border-box;'><li class="ecxcommit ecxjs-navigation-item ecxjs-updatable-content ecxcommits-list-item ecxtable-list-item ecxjs-details-container ecxjs-socket-channel ecxnavigation-focus" style="list-style: none; display: table-row; box-sizing: border-box; background-color: rgb(247, 251, 252);" data-url="/modula3/cm3/commit/66139d43e647970f6bb0df2f5c049f1d8dbe752e/show_partial?partial=commits%2Fcommits_list_item" data-channel="modula3/cm3:commit:66139d43e647970f6bb0df2f5c049f1d8dbe752e"><div class="ecxtable-list-cell ecxcommit-avatar-cell" style="padding: 8px 0px 8px 10px; width: 47px; font-size: 12px; vertical-align: top; border-top-color: rgb(238, 238, 238); border-left-color: rgb(238, 238, 238); border-top-width: 1px; border-left-width: 1px; border-top-style: solid; border-left-style: solid; display: table-cell; box-sizing: border-box;"><div class="ecxavatar-parent-child" style="box-sizing: border-box;"><a style="color: rgb(64, 120, 192); text-decoration: none; box-sizing: border-box; background-color: transparent;" href="https://github.com/jaykrell" target="_blank" rel="contributor" data-skip-pjax="true"><span id="ecxcid:5A952860-2A33-4642-B1A2-8FD21E094005@cecs.anu.edu.au"><1635728.png></span></a></div></div><div class="ecxtable-list-cell" style="padding: 8px 10px; font-size: 12px; vertical-align: top; border-top-color: rgb(238, 238, 238); border-top-width: 1px; border-top-style: solid; display: table-cell; box-sizing: border-box;"><div style="color: rgb(51, 51, 51); font-size: 15px; font-weight: bold; box-sizing: border-box;"><a title="add more information printed for some assertion failures move some assertion failures to run more often/earlier They will tend to run twice now; that isn't the point; the point is to run them earlier, when the work is queued, rather than later when it is dequed. Said assertions occur nowhere building 'std' on NT386, but do occur building testcase p206; this might be somewhat platform specific since it is alignment related. Remove a bunch of tabs. Fix warning leftover from Tony replacing my fix related to value vs. lvalue of constant arrays being used for subarray." class="ecxmessage" style="color: rgb(78, 87, 91); text-decoration: none; box-sizing: border-box; background-color: transparent;" href="https://github.com/modula3/cm3/commit/66139d43e647970f6bb0df2f5c049f1d8dbe752e" target="_blank" data-pjax="true">add more information printed for some assertion failures</a> <span class="ecxinline ecxhidden-text-expander" style="top: -1px; line-height: 0; display: inline-block; box-sizing: border-box;"><a class="ecxjs-details-target" style="padding: 0px 5px; border-radius: 1px; height: 12px; color: rgb(78, 87, 91); line-height: 6px; font-size: 12px; text-decoration: none; vertical-align: middle; display: inline-block; box-sizing: border-box; background-color: rgb(221, 221, 221);" href="https://github.com/modula3/cm3/commits/master/m3-sys/m3front/src/exprs/NilChkExpr.m3#" target="_blank">.</a></span></div><div class="ecxcommit-meta" style="color: rgb(118, 118, 118); box-sizing: border-box;"><a class="ecxtooltipped ecxcommit-author ecxtooltipped-s" style="color: rgb(118, 118, 118); text-decoration: none; box-sizing: border-box; background-color: transparent;" aria-label="View all commits by Jay Michael Krell" href="https://github.com/modula3/cm3/commits/master/m3-sys/m3front/src/exprs/NilChkExpr.m3?author=jaykrell" target="_blank" rel="contributor">jaykrell</a> authored <time title="May 4, 2008 at 9:03:50 PM GMT+10" style="box-sizing: border-box;" datetime="2008-05-04T11:03:50Z">on May 4, 2008</time></div></div><div class="ecxtable-list-cell ecxcommit-links-cell" style="padding: 8px 10px; width: 230px; text-align: right; font-size: 12px; vertical-align: top; border-top-color: rgb(238, 238, 238); border-right-color: rgb(238, 238, 238); border-top-width: 1px; border-right-width: 1px; border-top-style: solid; border-right-style: solid; display: table-cell; box-sizing: border-box;"><div class="ecxcommit-links-group ecxbtn-group" style="vertical-align: middle; display: inline-block; box-sizing: border-box;"><button class="ecxzeroclipboard-button ecxbtn ecxbtn-outline ecxjs-zeroclipboard" style="padding: 6px 12px; border-radius: 3px 0px 0px 3px; border: 1px solid rgb(229, 229, 229); color: rgb(64, 120, 192); line-height: 20px; overflow: visible; font-size: 13px; font-weight: bold; vertical-align: middle; white-space: nowrap; cursor: pointer; background-image: none; background-color: rgb(255, 255, 255);" aria-label="Copy the full SHA" type="button" data-copied-hint="Copied!" data-clipboard-text="66139d43e647970f6bb0df2f5c049f1d8dbe752e"><span class="ecxocticon ecxocticon-clippy" style="line-height: 1; font-family: octicons; font-size: 16px; font-weight: normal; vertical-align: text-top; display: inline-block; box-sizing: border-box; text-rendering: auto;"></span></button><a class="ecxsha ecxbtn ecxbtn-outline" style='padding: 6px 12px; border-radius: 0px 3px 3px 0px; border: 1px solid rgb(229, 229, 229); color: rgb(64, 120, 192); line-height: 20px; font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace; font-weight: bold; text-decoration: none; vertical-align: middle; display: inline-block; white-space: nowrap; cursor: pointer; box-sizing: border-box; background-image: none; background-color: rgb(255, 255, 255);' href="https://github.com/modula3/cm3/commit/66139d43e647970f6bb0df2f5c049f1d8dbe752e#diff-7e2dc1a1b7b8d761e1d4920f9cd58ec3" target="_blank">66139d4</a></div> <a class="ecxbtn ecxtooltipped-s ecxtooltipped ecxbtn-outline" style="padding: 6px 12px; border-radius: 3px; border: 1px solid rgb(229, 229, 229); color: rgb(64, 120, 192); line-height: 20px; font-size: 13px; font-weight: bold; text-decoration: none; vertical-align: middle; display: inline-block; white-space: nowrap; cursor: pointer; box-sizing: border-box; background-image: none; background-color: rgb(255, 255, 255);" aria-label="Browse the repository at this point in the history" href="https://github.com/modula3/cm3/tree/66139d43e647970f6bb0df2f5c049f1d8dbe752e/m3-sys/m3front/src/exprs/NilChkExpr.m3" target="_blank" rel="nofollow"><span class="ecxocticon ecxocticon-code" style="line-height: 1; font-family: octicons; font-size: 16px; font-weight: normal; vertical-align: text-top; display: inline-block; box-sizing: border-box; text-rendering: auto;"></span></a></div></li></ol><div class="ecxcommit-group-title" style='color: rgb(118, 118, 118); line-height: 18px; font-family: Helvetica, arial, nimbussansl, liberationsans, freesans, clean, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol"; font-size: 13px; box-sizing: border-box;'><span class="ecxocticon ecxocticon-git-commit" style="color: rgb(204, 204, 204); line-height: 1; font-family: octicons; font-size: 16px; display: inline-block; box-sizing: border-box; background-color: rgb(255, 255, 255); text-rendering: auto;"></span>Commits on Jan 4, 2008</div><ol class="ecxcommit-group ecxtable-list ecxtable-list-bordered" style='padding: 0px; width: 881px; color: rgb(153, 153, 153); line-height: 18px; font-family: Helvetica, arial, nimbussansl, liberationsans, freesans, clean, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol"; font-size: 13px; border-bottom-color: rgb(229, 229, 229); border-bottom-width: 1px; border-bottom-style: solid; display: table; list-style-type: none; table-layout: fixed; box-sizing: border-box;'><li class="ecxcommit ecxjs-navigation-item ecxjs-updatable-content ecxcommits-list-item ecxtable-list-item ecxjs-details-container ecxjs-socket-channel" style="list-style: none; display: table-row; box-sizing: border-box;" data-url="/modula3/cm3/commit/2412437e3043bdfcb5f13463b5b445c78aeb4c9b/show_partial?partial=commits%2Fcommits_list_item" data-channel="modula3/cm3:commit:2412437e3043bdfcb5f13463b5b445c78aeb4c9b"><div class="ecxtable-list-cell ecxcommit-avatar-cell" style="padding: 8px 0px 8px 10px; width: 47px; font-size: 12px; vertical-align: top; border-top-color: rgb(238, 238, 238); border-left-color: rgb(238, 238, 238); border-top-width: 1px; border-left-width: 1px; border-top-style: solid; border-left-style: solid; display: table-cell; box-sizing: border-box;"><div class="ecxavatar-parent-child" style="box-sizing: border-box;"><a style="color: rgb(64, 120, 192); text-decoration: none; box-sizing: border-box;" href="https://github.com/jaykrell" target="_blank" rel="contributor" data-skip-pjax="true"><span id="ecxcid:5A952860-2A33-4642-B1A2-8FD21E094005@cecs.anu.edu.au"><1635728.png></span></a></div></div><div class="ecxtable-list-cell" style="padding: 8px 10px; font-size: 12px; vertical-align: top; border-top-color: rgb(238, 238, 238); border-top-width: 1px; border-top-style: solid; display: table-cell; box-sizing: border-box;"><div style="color: rgb(51, 51, 51); font-size: 15px; font-weight: bold; box-sizing: border-box;"><a title="initial diff from ../config/PPC_LINUX" class="ecxmessage" style="color: rgb(78, 87, 91); text-decoration: none; box-sizing: border-box;" href="https://github.com/modula3/cm3/commit/2412437e3043bdfcb5f13463b5b445c78aeb4c9b" target="_blank" data-pjax="true">initial diff from ../config/PPC_LINUX</a></div><div class="ecxcommit-meta" style="color: rgb(118, 118, 118); box-sizing: border-box;"><a class="ecxtooltipped ecxcommit-author ecxtooltipped-s" style="color: rgb(118, 118, 118); text-decoration: none; box-sizing: border-box;" aria-label="View all commits by Jay Michael Krell" href="https://github.com/modula3/cm3/commits/master/m3-sys/m3front/src/exprs/NilChkExpr.m3?author=jaykrell" target="_blank" rel="contributor">jaykrell</a> authored <time title="January 4, 2008 at 12:40:08 AM GMT+11" style="box-sizing: border-box;" datetime="2008-01-03T13:40:08Z">on Jan 4, 2008</time></div></div><div class="ecxtable-list-cell ecxcommit-links-cell" style="padding: 8px 10px; width: 230px; text-align: right; font-size: 12px; vertical-align: top; border-top-color: rgb(238, 238, 238); border-right-color: rgb(238, 238, 238); border-top-width: 1px; border-right-width: 1px; border-top-style: solid; border-right-style: solid; display: table-cell; box-sizing: border-box;"><div class="ecxcommit-links-group ecxbtn-group" style="vertical-align: middle; display: inline-block; box-sizing: border-box;"><button class="ecxzeroclipboard-button ecxbtn ecxtooltipped-s ecxtooltipped ecxbtn-outline ecxjs-zeroclipboard" style="padding: 6px 12px; border-radius: 3px 0px 0px 3px; border: 1px solid rgb(229, 229, 229); color: rgb(64, 120, 192); line-height: 20px; overflow: visible; font-size: 13px; font-weight: bold; vertical-align: middle; white-space: nowrap; cursor: pointer; background-image: none; background-color: rgb(255, 255, 255);" aria-label="Copy the full SHA" type="button" data-copied-hint="Copied!" data-clipboard-text="2412437e3043bdfcb5f13463b5b445c78aeb4c9b"><span class="ecxocticon ecxocticon-clippy" style="line-height: 1; font-family: octicons; font-size: 16px; font-weight: normal; vertical-align: text-top; display: inline-block; box-sizing: border-box; text-rendering: auto;"></span></button><a class="ecxsha ecxbtn ecxbtn-outline" style='padding: 6px 12px; border-radius: 0px 3px 3px 0px; border: 1px solid rgb(229, 229, 229); color: rgb(64, 120, 192); line-height: 20px; font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace; font-weight: bold; text-decoration: none; vertical-align: middle; display: inline-block; white-space: nowrap; cursor: pointer; box-sizing: border-box; background-image: none; background-color: rgb(255, 255, 255);' href="https://github.com/modula3/cm3/commit/2412437e3043bdfcb5f13463b5b445c78aeb4c9b#diff-7e2dc1a1b7b8d761e1d4920f9cd58ec3" target="_blank">2412437</a></div> <a class="ecxbtn ecxtooltipped-s ecxtooltipped ecxbtn-outline" style="padding: 6px 12px; border-radius: 3px; border: 1px solid rgb(229, 229, 229); color: rgb(64, 120, 192); line-height: 20px; font-size: 13px; font-weight: bold; text-decoration: none; vertical-align: middle; display: inline-block; white-space: nowrap; cursor: pointer; box-sizing: border-box; background-image: none; background-color: rgb(255, 255, 255);" aria-label="Browse the repository at this point in the history" href="https://github.com/modula3/cm3/tree/2412437e3043bdfcb5f13463b5b445c78aeb4c9b/m3-sys/m3front/src/exprs/NilChkExpr.m3" target="_blank" rel="nofollow"><span class="ecxocticon ecxocticon-code" style="line-height: 1; font-family: octicons; font-size: 16px; font-weight: normal; vertical-align: text-top; display: inline-block; box-sizing: border-box; text-rendering: auto;"></span></a></div></li></ol><div><br></div></div></div></div></blockquote></div><br></div></div></div></blockquote></div><br></div> </div></body>
</html>