<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'><div>I don't know if I'm doing anything right or wrong,</div><div>but I think there are problems in the initial cvs import.</div><div>The change you point to is over-attributes, as the change that added many files I think.</div><div><br></div><div>Can you point to problems with my git commits?</div><div><br></div><div> - Jay</div><br><br><div><hr id="stopSpelling">From: jay.krell@cornell.edu<br>To: hosking@purdue.edu<br>Date: Tue, 1 Sep 2015 07:43:12 +0000<br>CC: m3commit@elegosoft.com<br>Subject: Re: [M3commit] [modula3/cm3] 4537cb: remove unused locals<br><br>
<style><!--
.ExternalClass .ecxhmmessage P {
padding:0px;
}
.ExternalClass body.ecxhmmessage {
font-size:12pt;
font-family:Calibri;
}
--></style>
<div dir="ltr">RTCollector has had not changes in git, only cvs, imported.<div>So I don't know how to reason about it.</div><div>I agree its history in git looks wrong, and different than cvs.</div><div><br></div><div> - Jay<br><br><br><br><div><hr id="ecxstopSpelling">From: jay.krell@cornell.edu<br>To: hosking@purdue.edu<br>Date: Tue, 1 Sep 2015 07:26:29 +0000<br>CC: m3commit@elegosoft.com<br>Subject: Re: [M3commit] [modula3/cm3] 4537cb: remove unused locals<br><br>
<style><!--
.ExternalClass .ecxhmmessage P {
padding:0px;
}
.ExternalClass body.ecxhmmessage {
font-size:12pt;
font-family:Calibri;
}
--></style>
<div dir="ltr">rereading some tutorials..<div><br></div><div><br></div><div>I use git push and git pull w/o parameters.</div><div>I believe this defaults to origin/master, that the tutorials list explicitly.</div><div>The tutorials recommend --rebase, that I haven't been doing, in order to avoid</div><div>my pulls being in the history, since they are fairly redundant.</div><div><br></div><div>I'll poke around a bit more but maybe not tonight.</div><div><br></div><div> - Jay</div><div><br><br><br><div><hr id="ecxstopSpelling">From: jay.krell@cornell.edu<br>To: hosking@purdue.edu<br>Date: Tue, 1 Sep 2015 07:15:32 +0000<br>CC: m3commit@elegosoft.com<br>Subject: Re: [M3commit] [modula3/cm3] 4537cb: remove unused locals<br><br>
<style><!--
.ExternalClass .ecxhmmessage P {
padding:0px;
}
.ExternalClass body.ecxhmmessage {
font-size:12pt;
font-family:Calibri;
}
--></style>
<div dir="ltr">Just git push, git pull, git commit.<div><br></div><div> - Jay<br><br><br><br><div><hr id="ecxstopSpelling">Subject: Re: [M3commit] [modula3/cm3] 4537cb: remove unused locals<br>From: hosking@purdue.edu<br>Date: Tue, 1 Sep 2015 16:58:47 +1000<br>CC: m3commit@elegosoft.com<br>To: jay.krell@cornell.edu<br><br>Jay, it appears that your commits are still messing up the history.<div><br></div><div>As of your most recent commit we have lost history again. What exactly are you doing when you use git against the repo?</div><div><br></div><div>For instance, if you take a look at RTCollector we see a history with the oldest commit labelled "<a href="https://github.com/modula3/cm3/commit/2412437e3043bdfcb5f13463b5b445c78aeb4c9b" class="ecxmessage" data-pjax="true" title="initial diff from ../config/PPC_LINUX" style="box-sizing:border-box;color:rgb(78, 87, 91);text-decoration:none;font-family:Helvetica, arial, nimbussansl, liberationsans, freesans, clean, sans-serif, 'Segoe UI Emoji', 'Segoe UI Symbol';font-size:15px;font-weight:bold;line-height:21px;" target="_blank">initial diff from ../config/PPC_LINUX</a>" from Jan 4, 2008.</div><div><br></div><div>Whereas it should have the oldest commit labeled as follows from when Olaf first imported from cvs to svn.</div><div><span style="color:rgb(175, 173, 36);font-family:Menlo;font-size:11px;"><br></span></div><div><span style="color:rgb(175, 173, 36);font-family:Menlo;font-size:11px;">commit cfac2c79141d61c291a40177f0d5490f774c032f</span><div style="font-size:11px;font-family:Menlo;">Author: Olaf Wagner <<a href="mailto:wagner@elegosoft.com">wagner@elegosoft.com</a>></div><div style="font-size:11px;font-family:Menlo;">Date: Wed Jan 24 12:24:49 2001 +0000</div><div style="font-size:11px;font-family:Menlo;min-height:13px;"><br></div><div style="font-size:11px;font-family:Menlo;"> This commit was generated by cvs2svn to compensate for changes in r20, which</div><div style="font-size:11px;font-family:Menlo;"> included commits to RCS files with non-trunk default branches.</div><div style="font-size:11px;font-family:Menlo;"><br></div><div><br><div><blockquote><div>On 1 Sep 2015, at 3:54 pm, jaykrell <<a href="mailto:jay.krell@cornell.edu">jay.krell@cornell.edu</a>> wrote:</div><br class="ecxApple-interchange-newline"><div> Branch: refs/heads/master<br> Home: <a href="https://github.com/modula3/cm3" target="_blank">https://github.com/modula3/cm3</a><br> Commit: 4537cb804fbf864a076235495db77eebf9c5dab6<br> <a href="https://github.com/modula3/cm3/commit/4537cb804fbf864a076235495db77eebf9c5dab6" target="_blank">https://github.com/modula3/cm3/commit/4537cb804fbf864a076235495db77eebf9c5dab6</a><br> Author: jaykrell <<a href="mailto:jay.krell@cornell.edu">jay.krell@cornell.edu</a>><br> Date: 2015-08-31 (Mon, 31 Aug 2015)<br><br> Changed paths:<br> M m3-sys/cm3/src/Builder.m3<br><br> Log Message:<br> -----------<br> remove unused locals<br><br><br> Commit: 477c3d058a95ba8a06c90ac5d36dceefd3e7f39a<br> <a href="https://github.com/modula3/cm3/commit/477c3d058a95ba8a06c90ac5d36dceefd3e7f39a" target="_blank">https://github.com/modula3/cm3/commit/477c3d058a95ba8a06c90ac5d36dceefd3e7f39a</a><br> Author: jaykrell <<a href="mailto:jay.krell@cornell.edu">jay.krell@cornell.edu</a>><br> Date: 2015-08-31 (Mon, 31 Aug 2015)<br><br> Changed paths:<br> M m3-sys/cm3/src/Builder.m3<br><br> Log Message:<br> -----------<br> Fix regression from "7/31 Initial integration of llvm back end into cm3's build system." when bootstrapping<br>using cm3cg. .c files pass through for bootstrap, along with any .h or checked in .s/.o etc.<br>bootstrapping is using cm3 -boot.<br><br><br> Commit: 459512da7848b534636c1fe4e1095eee76ad2d89<br> <a href="https://github.com/modula3/cm3/commit/459512da7848b534636c1fe4e1095eee76ad2d89" target="_blank">https://github.com/modula3/cm3/commit/459512da7848b534636c1fe4e1095eee76ad2d89</a><br> Author: jaykrell <<a href="mailto:jay.krell@cornell.edu">jay.krell@cornell.edu</a>><br> Date: 2015-08-31 (Mon, 31 Aug 2015)<br><br> Changed paths:<br> A m3-sys/llvm3.6.1/src/LLVM.i3<br> A m3-sys/llvm3.6.1/src/M3CG_LLVM.i3<br> A m3-sys/llvm3.6.1/src/M3CG_LLVM.m3<br> A m3-sys/llvm3.6.1/src/Main.m3<br> A m3-sys/llvm3.6.1/src/m3makefile<br><br> Log Message:<br> -----------<br> Merge branch 'master' of github.com:modula3/cm3<br><br>pull from master<br><br><br>Compare: <a href="https://github.com/modula3/cm3/compare/b068a306fe87...459512da7848_______________________________________________" target="_blank">https://github.com/modula3/cm3/compare/b068a306fe87...459512da7848_______________________________________________</a><br>M3commit mailing list<br><a href="mailto:M3commit@elegosoft.com">M3commit@elegosoft.com</a><br>https://mail.elegosoft.com/cgi-bin/mailman/listinfo/m3commit<br></div></blockquote></div><br></div></div></div></div> </div>
<br>_______________________________________________
M3commit mailing list
M3commit@elegosoft.com
https://mail.elegosoft.com/cgi-bin/mailman/listinfo/m3commit</div></div> </div>
<br>_______________________________________________
M3commit mailing list
M3commit@elegosoft.com
https://mail.elegosoft.com/cgi-bin/mailman/listinfo/m3commit</div></div> </div>
<br>_______________________________________________
M3commit mailing list
M3commit@elegosoft.com
https://mail.elegosoft.com/cgi-bin/mailman/listinfo/m3commit</div> </div></body>
</html>