Skip to contentSkip to conversation

microblaze: Merge window + git

DISCUSSION Michal Simek 4 participants 5 messages Apr 11, 2008 – Apr 13, 2008

lore
Share & tools
lore
#0 lore raw

Hi everybody,

Can you tell me when is open next merge window?

and my next question is about GIT.

I have second release at my git server and I have some changes which you reported. I would like to collect all changes in the same set of patches.

I mean I have patch with 4 files and I did next changes. I would like to integrate these changes to the same patches. Is it possible to do it? It is easier to review all changes together.

I think it is no good way to send first release with reported bugs and new diffs.

Thanks,
Michal Simek
www.monstr.eu

#1 lore raw
Quoted 1 line · Michal Simek

Can you tell me when is open next merge window?

When 2.6.25 is being released.

Quoted 10 lines

and my next question is about GIT.

I have second release at my git server and I have some changes which you reported. I would like to collect all changes in the same set of patches.

I mean I have patch with 4 files and I did next changes. I would like to integrate these changes to the same patches. Is it possible to do it? It is easier to review all changes together.

I think it is no good way to send first release with reported bugs and new diffs.

You can combine several commits into one in a few ways. Of course the combined commit is an entirely new one (with its own SHA1 etc.). One possible way:

# you are at <commit0>
$ git cherry-pick --no-commit <commit1>   # apply but don't commit yet
$ git cherry-pick --edit <commit2>   # apply, edit the changelog, commit

There will now be a <commit3> whose parent is <commit0>. <commit3> incorporates changes of <commit1> and <commit2>.

Another way:

# you are at <commit0>
$ patch < ~/diff-from-somewhere
$ git commit --amend   # replace <commit0> by new amended commit

There will now be a <commit4> instead of <commit0>, with the same parent(s) which <commit0> had. <commit4> incorporates changes of <commit0> and the diff.

However, I am no expert on doing these things in git since I only develop with quilt. I use git only to publish the state of development and the state for upstream merge.

Signature · 3 lines
Stefan Richter
-=====-==--- -=-- -=-==
http://arcgraph.de/sr/
#2 lore raw
Quoted 29 lines · Stefan Richter
Quoted 1 line · Michal Simek

Can you tell me when is open next merge window?

When 2.6.25 is being released.

Quoted 10 lines

and my next question is about GIT.

I have second release at my git server and I have some changes which you reported. I would like to collect all changes in the same set of patches.

I mean I have patch with 4 files and I did next changes. I would like to integrate these changes to the same patches. Is it possible to do it? It is easier to review all changes together.

I think it is no good way to send first release with reported bugs and new diffs.

You can combine several commits into one in a few ways. Of course the combined commit is an entirely new one (with its own SHA1 etc.). One possible way:

# you are at <commit0>
$ git cherry-pick --no-commit <commit1>   # apply but don't commit yet
$ git cherry-pick --edit <commit2>   # apply, edit the changelog, commit

There will now be a <commit3> whose parent is <commit0>. <commit3> incorporates changes of <commit1> and <commit2>.

Another way:

Quoted 7 lines
# you are at <commit0>
$ patch < ~/diff-from-somewhere
$ git commit --amend   # replace <commit0> by new amended commit

There will now be a <commit4> instead of <commit0>, with the same parent(s) which <commit0> had. <commit4> incorporates changes of <commit0> and the diff.

If you have a tree which has those four commits on top, it's rather easy with git:

$ git-reset --soft HEAD^^^
$ git-commit --amend

...In order the git-reset --soft to leave the index into the desired state, no pending stuff should be in index before beginning (index is the thing controlled with cmds like git-add/git-update-index/etc.).

...The commit's message is taken from the bottommost of those four original commits.

Signature · 1 line
 i.
#3 lore raw
In reply to Stefan Richter
Quoted 5 lines · Stefan Richter
Quoted 1 line · Michal Simek

Can you tell me when is open next merge window?

When 2.6.25 is being released.

... which is expected to be within the week, so you're quite in luck.

-hpa

#4 lore raw

Thanks for your answers,

I integrate all reported bugs and I sent request to Microblaze community to review. I will clean patches to compact pack for your review.

Regards,
Michal Simek
www.monstr.eu

Quoted 11 lines
Quoted 5 lines · Stefan Richter
Quoted 1 line · Michal Simek

Can you tell me when is open next merge window?

When 2.6.25 is being released.

... which is expected to be within the week, so you're quite in luck.

-hpa