ChiliProject is not maintained anymore. Please be advised that there will be no more updates.

We do not recommend that you setup new ChiliProject instances and we urge all existing users to migrate their data to a maintained system, e.g. Redmine. We will provide a migration script later. In the meantime, you can use the instructions by Christian Daehn.

[Decided] - How to track which commits have been pulled from Redmine?

Added by Eric Davis at 2011-03-19 12:12 am

How should we track which commits we have pulled from Redmine? I've been using my Wiki Page but that is already a bit out of control and difficult to manage.

Since our git tree is different than Redmine, when we pull commits across they get a new sha. git is smart enough to know they were applied but I'd like an easier way to scan and manage the list.

One idea I have is to have a Google spreadsheet that lists "Redmine sha", "ChiliProject sha", "Status", and "Notes". We can make the spreadsheet public and allow committers to edit it as they pull in commits. (I'm only proposing a separate spreadsheet because managing large tables in textile is painful...)

Any thoughts? Should I give it a try and see how it works out?

Eric Davis


Replies (4)

RE: How to track which commits have been pulled from Redmine? - Added by Felix Schäfer at 2011-03-19 09:42 am

Eric Davis wrote:

Should I give it a try and see how it works out?

As you're pretty much the only one doing that part of the work, I'd say try it out and do what works for you, the others will adapt :-)

RE: How to track which commits have been pulled from Redmine? - Added by Ivan Evtuhovich at 2011-03-19 10:16 am

There a very good git command:

git cherry -v

It shows what commit was cherry-picked, independent of sha of commit (it compares diffs). I don't know, how this work with multiple merges, because we only cherry-pick commits in our project, but with cherry-pick it works really good.

RE: How to track which commits have been pulled from Redmine? - Added by Eric Davis at 2011-03-19 02:22 pm

Ivan:

Thanks, I tried cherry last night but it wasn't getting all of the commits I wanted. I think I have something that might work though, need to do to do some final testing with it.

Eric Davis

RE: How to track which commits have been pulled from Redmine? - Added by Eric Davis at 2011-03-24 09:36 pm

I've got a few scripts to help me churn through all of the commits and have compiled the data into a Google spreadsheet now. It's public so everyone should be able to see it if they are curious about what has and hasn't been pulled in.

https://spreadsheets.google.com/ccc?key=0AhPDRHlxng9ydHVHd2w2cFlPX0F4SnNuclAxTDVRMFE&hl=en#gid=0

Eric Davis

(1-4/4)