[jackpap]

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

[olesen]

Originally Posted by jackpap

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.

[jackpap]

Thank you Olesen,
could you indicate the procedure for this ? It would be very helpful, as I am not a git guru.
Cheers,
J.

[olesen]

Originally Posted by jackpap

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/

[jackpap]

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.

[olesen]

Originally Posted by jackpap

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.

[zeliboba]

Originally Posted by olesen

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

git diff foam15x/master foam16x/master

without merging the branches. or did I miss something?

[olesen]

Originally Posted by zeliboba

..
history is not merged in this way. you can play with

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.

[zeliboba]

Originally Posted by jackpap

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

[jackpap]

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..)

[zeliboba]

Originally Posted by jackpap

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

[wyldckat]

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