CFD Online Logo CFD Online URL
www.cfd-online.com
[Sponsors]
Home > Forums > OpenFOAM

GIT history OF 1.5 to 1.6

Register Blogs Members List Search Today's Posts Mark Forums Read

Like Tree1Likes
  • 1 Post By wyldckat

Reply
 
LinkBack Thread Tools Display Modes
Old   November 23, 2009, 14:17
Default GIT history OF 1.5 to 1.6
  #1
New Member
 
Jacques
Join Date: Oct 2009
Posts: 13
Rep Power: 6
jackpap is on a distinguished road
Hello,

I was wondering if there is any way of having a continuous GIT history of changes from 1.5.x to 1.6.x ?
When I checkout the git for 1.6.x and look at the history it only goes back to 07/2009, I assume that there have been massive changes between the last 1.5.x patch and the first 1.6.x ...

Thanks anyone,
Jacques
jackpap is offline   Reply With Quote

Old   November 24, 2009, 03:24
Default
  #2
Senior Member
 
Mark Olesen
Join Date: Mar 2009
Location: http://olesenm.github.io/
Posts: 774
Rep Power: 17
olesen will become famous soon enough
Quote:
Originally Posted by jackpap View Post
I was wondering if there is any way of having a continuous GIT history of changes from 1.5.x to 1.6.x ?
When I checkout the git for 1.6.x and look at the history it only goes back to 07/2009, I assume that there have been massive changes between the last 1.5.x patch and the first 1.6.x ...
Not a contiguous history, but if you are happy with just seeing everything that changed between the two versions (and perhaps registering it in git), that's quite easy to do.
olesen is offline   Reply With Quote

Old   November 24, 2009, 05:45
Default How ?
  #3
New Member
 
Jacques
Join Date: Oct 2009
Posts: 13
Rep Power: 6
jackpap is on a distinguished road
Thank you Olesen,
could you indicate the procedure for this ? It would be very helpful, as I am not a git guru.
Cheers,
J.
jackpap is offline   Reply With Quote

Old   November 25, 2009, 02:28
Default
  #4
Senior Member
 
Mark Olesen
Join Date: Mar 2009
Location: http://olesenm.github.io/
Posts: 774
Rep Power: 17
olesen will become famous soon enough
Quote:
Originally Posted by jackpap View Post
Thank you Olesen,
could you indicate the procedure for this ? It would be very helpful, as I am not a git guru.
I'm certainly not a git guru either, but the merge really is fairly simple.
Instead of squeezing it all in here, I made a blog entry about it instead:
http://olesenm.github.com/2009/11/24...FOAM-versions/
olesen is offline   Reply With Quote

Old   November 25, 2009, 04:35
Default Thanks!
  #5
New Member
 
Jacques
Join Date: Oct 2009
Posts: 13
Rep Power: 6
jackpap is on a distinguished road
Thank you for your very well thought out post.
I will try it out. It is a bit frustrating not to have the complete history of changes. I would be interested in seeing the commit messages for example. It would also give a better idea of what groups of code were modified together / at the same time.. etc.. .

Thanks again,
J.
jackpap is offline   Reply With Quote

Old   November 25, 2009, 04:55
Default
  #6
Senior Member
 
Mark Olesen
Join Date: Mar 2009
Location: http://olesenm.github.io/
Posts: 774
Rep Power: 17
olesen will become famous soon enough
Quote:
Originally Posted by jackpap View Post
It is a bit frustrating not to have the complete history of changes. I would be interested in seeing the commit messages for example. It would also give a better idea of what groups of code were modified together / at the same time.. etc.. .
That depends largely on how any particular person does their commits. One extreme are people who like to do lots of changes and commit as one large chunk. In this case you might have a commit "updated to my current version" that contains many, sometimes unrelated, changes.
Other people prefer a fair number of smaller commits - I tend to work like that at times. After a particular feature (eg, a class method) has reached a somewhat stable stage I commit those portions of the code. I use this as a safety net in case I need to go back to an particular stable version later. Reworking a particular class might then result in 10 or more separate commits before it is all done. In between there might be some other commits that are fully unrelated.
In both cases you might not easily find the groups of changed code immediately.
olesen is offline   Reply With Quote

Old   December 11, 2009, 19:09
Default
  #7
Member
 
Maxim Loginov
Join Date: Mar 2009
Posts: 33
Rep Power: 7
zeliboba is on a distinguished road
Quote:
Originally Posted by olesen View Post
Not a contiguous history, but if you are happy with just seeing everything that changed between the two versions (and perhaps registering it in git), that's quite easy to do.
I looked through the post in your blog and did not understand why do this kind of merge? history is not merged in this way. you can play with
Code:
git diff foam15x/master foam16x/master
without merging the branches. or did I miss something?
zeliboba is offline   Reply With Quote

Old   December 12, 2009, 08:22
Default
  #8
Senior Member
 
Mark Olesen
Join Date: Mar 2009
Location: http://olesenm.github.io/
Posts: 774
Rep Power: 17
olesen will become famous soon enough
Quote:
Originally Posted by zeliboba View Post
..
history is not merged in this way. you can play with
Code:
git diff foam15x/master foam16x/master
without merging the branches. or did I miss something?
Nope, you didn't miss anything. The merge 'ours' approach is, in this case, primarily useful if you want a single repository later with all of the 1.5.x and 1.6.x changes. However, if you have some of your own custom changes that you would like to rebase onto 1.6.x, this type of approach can help there.
olesen is offline   Reply With Quote

Old   December 12, 2009, 17:25
Default
  #9
Member
 
Maxim Loginov
Join Date: Mar 2009
Posts: 33
Rep Power: 7
zeliboba is on a distinguished road
Quote:
Originally Posted by jackpap View Post
I was wondering if there is any way of having a continuous GIT history of changes from 1.5.x to 1.6.x ?
take a look at freefoam it has continues history in branch upstream/OpenFOAM
zeliboba is offline   Reply With Quote

Old   May 1, 2010, 04:16
Default
  #10
New Member
 
Jacques
Join Date: Oct 2009
Posts: 13
Rep Power: 6
jackpap is on a distinguished road
Using cmake is a nice idea... Can you tell me if freefoam is currently maintained ? (It seems like the last commit was done in January, and only Michael Wild seems to be developing..)
jackpap is offline   Reply With Quote

Old   May 1, 2010, 04:48
Default
  #11
Member
 
Maxim Loginov
Join Date: Mar 2009
Posts: 33
Rep Power: 7
zeliboba is on a distinguished road
Quote:
Originally Posted by jackpap View Post
Using cmake is a nice idea... Can you tell me if freefoam is currently maintained ? (It seems like the last commit was done in January, and only Michael Wild seems to be developing..)
unfortunately I do not have more information, only from git repository
zeliboba is offline   Reply With Quote

Old   December 25, 2013, 22:40
Default
  #12
Super Moderator
 
Bruno Santos
Join Date: Mar 2009
Location: Lisbon, Portugal
Posts: 7,201
Blog Entries: 32
Rep Power: 71
wyldckat is a jewel in the roughwyldckat is a jewel in the roughwyldckat is a jewel in the rough
Greetings to all!

I know that this thread is now really old, but is still the best place to report this - If anyone is looking for a single repository that has the (nearly) complete git history of OpenFOAM 1.5.x to 2.2.x, check this repository: https://github.com/wyldckat/OpenFOAM-combo/

It's not perfectly complete, because I used a lot of "git rebase", which condenses the commits to the minimum necessary, which leads to a more simplified commit history. This also means that the git hashes are not preserved using this technique, while Mark Olesen's technique does preserve the original hashes.

The "README.md" file should have almost all of the necessary information to reproduce the same thing.

Best regards,
Bruno
Ohbuchi likes this.
wyldckat is offline   Reply With Quote

Reply

Thread Tools
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off
Trackbacks are On
Pingbacks are On
Refbacks are On


Similar Threads
Thread Thread Starter Forum Replies Last Post
1.5 => 1.6: Matrix template - ODETest does not compile markc OpenFOAM Programming & Development 2 November 26, 2013 17:00
Change in triangle::intersection breaks stitchMesh in 1.5 and 1.6 gschaider OpenFOAM Bugs 7 February 12, 2010 09:21
ChtMuliRegionFoam-Case (OF 1.6 Tutorial-case -> OF 1.5) suitup OpenFOAM 15 November 11, 2009 12:43
OpenFOAM Patched Version 1.5 via git Repository OpenFOAM discussion board administrator OpenFOAM Announcements from ESI-OpenCFD 0 August 26, 2008 05:06
CFX4.3 -build analysis form Chie Min CFX 5 July 12, 2001 23:19


All times are GMT -4. The time now is 18:23.