DevHeads.net

git rebase request on a project

Sorry if this is a dumb question, but I cannot find any information.

I would like to have "git rebase master" on f16, f17, and f18
branches of <a href="http://pkgs.fedoraproject.org/cgit/megaglest.git" title="http://pkgs.fedoraproject.org/cgit/megaglest.git">http://pkgs.fedoraproject.org/cgit/megaglest.git</a>
I once messed it a bit by adding a commit only to branches and
later merging master, now I cannot merge without a "merge master"
commit, and am not allowed to push myself a "git rebase master"
branch.

Thanks,
Paulo

Comments

Re: git rebase request on a project

By Stephen Gallagher at 01/18/2013 - 10:27

On Fri 18 Jan 2013 06:55:26 AM EST, Paulo C├ęsar Pereira de Andrade
wrote:

Rebases like that are not permitted in Fedora because they rewrite
history (and therefore mean we wouldn't be able to exactly recreate an
older build if we needed to). You're going to have to do the merge and
manage the merge conflicts appropriately (either via 'git merge' or by
starting from the tarball and working your way up again without a merge
commit).

Re: git rebase request on a project

By Stanislav Ochotnicky at 01/21/2013 - 08:28

Quoting Stephen Gallagher (2013-01-18 15:27:30)

If I understood Paulo correctly, he merely wanted to linearize his history so he
can continue doing fast-forward merges again. I've cross-merged branches so that
they are now again on the same hash. Content of all branches (f16+) was the same
so they were all without conflicts.

For future, please do everything in master first :-)

Enjoy,

Re: git rebase request on a project

By =?ISO-8859-1?Q?... at 01/21/2013 - 10:34

2013/1/21 Stanislav Ochotnicky < ... at redhat dot com>:
Exactly, I want to do fast-forward merges, but I messed sometime
ago by pushing a commit only to branches.
I also did not properly explain what I did want to push, it would be
basically:

$ fedpkg clone megaglest
$ cd megaglest
$ for branch in f16 f17 f18; do
fedpkg switch-branch $branch
git rebase master
git rebase --skip
done
$ git push --all

But then I messed even more because I was not allowed to
push that.

The conflict would be "Package currently is x86 specific (#855736)"
commit. But I think better to not try to fix it by adding that commit
to master now.
The above would be to "clean" the history and remove the series
of "Merge branch ..." from the history, but it would be a cosmetic
change.

Thanks, I learned my lesson :-)

Paulo