[M3commit] [modula3/cm3] 4537cb: remove unused locals

Jay K jay.krell at cornell.edu
Tue Sep 1 09:18:02 CEST 2015

I use git pull to update my local repository to be "like" github.I use git commit to commit my local edits to my local repository.It use git push to push my local repository changes to the master.I don't know what rebasing is or how/why to use it.
 - Jay

Subject: Re: [M3commit] [modula3/cm3] 4537cb: remove unused locals
From: hosking at purdue.edu
Date: Tue, 1 Sep 2015 17:10:51 +1000
CC: jay.krell at cornell.edu; m3commit at elegosoft.com; m3devel at elegosoft.com
To: hosking at purdue.edu

It appears to be this merge action which is causing the problem.I don’t have time to explore right now.  If anyone else can it would be most appreciated.
On 1 Sep 2015, at 5:08 pm, Antony Hosking <hosking at purdue.edu> wrote:Whatever you are doing I now don’t know how to recover from.It appears that somehow you are rebasing the history on the master branch, but I don’t quite know how.
On 1 Sep 2015, at 5:00 pm, Antony Hosking <hosking at purdue.edu> wrote:In your work flow are you using "git push" to push your local commits?  Or are you doing something else?

On 1 Sep 2015, at 4:58 pm, Antony Hosking <hosking at purdue.edu> wrote: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
  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
  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
  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

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://m3lists.elegosoft.com/pipermail/m3commit/attachments/20150901/5c7ce0a5/attachment-0002.html>

More information about the M3commit mailing list