rereading some tutorials..
I use git push and git pull w/o parameters.I believe this defaults to origin/master, that the tutorials list explicitly.The tutorials recommend --rebase, that I haven't been doing, in order to avoidmy pulls being in the history, since they are fairly redundant.
I'll poke around a bit more but maybe not tonight.
- Jay
From: jay.krell at cornell.edu
To: hosking at purdue.edu
Date: Tue, 1 Sep 2015 07:15:32 +0000
CC: m3commit at elegosoft.com
Subject: Re: [M3commit] [modula3/cm3] 4537cb: remove unused locals
Just git push, git pull, git commit.
- Jay
Subject: Re: [M3commit] [modula3/cm3] 4537cb: remove unused locals
From: hosking at purdue.edu
Date: Tue, 1 Sep 2015 16:58:47 +1000
CC: m3commit at elegosoft.com
To: jay.krell at cornell.edu
Jay, it appears that your commits are still messing up the history.
As of your most recent commit we have lost history again. What exactly are you doing when you use git against the repo?
For instance, if you take a look at RTCollector we see a history with the oldest commit labelled "initial diff from ../config/PPC_LINUX" from Jan 4, 2008.
Whereas it should have the oldest commit labeled as follows from when Olaf first imported from cvs to svn.
commit cfac2c79141d61c291a40177f0d5490f774c032fAuthor: Olaf Wagner <wagner at elegosoft.com>Date: Wed Jan 24 12:24:49 2001 +0000
This commit was generated by cvs2svn to compensate for changes in r20, which included commits to RCS files with non-trunk default branches.
On 1 Sep 2015, at 3:54 pm, jaykrell <jay.krell at cornell.edu> wrote: Branch: refs/heads/master
Home: https://github.com/modula3/cm3
Commit: 4537cb804fbf864a076235495db77eebf9c5dab6
https://github.com/modula3/cm3/commit/4537cb804fbf864a076235495db77eebf9c5dab6
Author: jaykrell <jay.krell at cornell.edu>
Date: 2015-08-31 (Mon, 31 Aug 2015)
Changed paths:
M m3-sys/cm3/src/Builder.m3
Log Message:
-----------
remove unused locals
Commit: 477c3d058a95ba8a06c90ac5d36dceefd3e7f39a
https://github.com/modula3/cm3/commit/477c3d058a95ba8a06c90ac5d36dceefd3e7f39a
Author: jaykrell <jay.krell at cornell.edu>
Date: 2015-08-31 (Mon, 31 Aug 2015)
Changed paths:
M m3-sys/cm3/src/Builder.m3
Log Message:
-----------
Fix regression from "7/31 Initial integration of llvm back end into cm3's build system." when bootstrapping
using cm3cg. .c files pass through for bootstrap, along with any .h or checked in .s/.o etc.
bootstrapping is using cm3 -boot.
Commit: 459512da7848b534636c1fe4e1095eee76ad2d89
https://github.com/modula3/cm3/commit/459512da7848b534636c1fe4e1095eee76ad2d89
Author: jaykrell <jay.krell at cornell.edu>
Date: 2015-08-31 (Mon, 31 Aug 2015)
Changed paths:
A m3-sys/llvm3.6.1/src/LLVM.i3
A m3-sys/llvm3.6.1/src/M3CG_LLVM.i3
A m3-sys/llvm3.6.1/src/M3CG_LLVM.m3
A m3-sys/llvm3.6.1/src/Main.m3
A m3-sys/llvm3.6.1/src/m3makefile
Log Message:
-----------
Merge branch 'master' of github.com:modula3/cm3
pull from master
Compare: https://github.com/modula3/cm3/compare/b068a306fe87...459512da7848_______________________________________________
M3commit mailing list
M3commit at elegosoft.com
https://mail.elegosoft.com/cgi-bin/mailman/listinfo/m3commit
_______________________________________________
M3commit mailing list
M3commit at elegosoft.com
https://mail.elegosoft.com/cgi-bin/mailman/listinfo/m3commit
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://m3lists.elegosoft.com/pipermail/m3commit/attachments/20150901/24a0a6d6/attachment-0002.html>