12:40 p.m.
2016-11-23 0:38 GMT+01:00 Sérgio M. Basto <sergiomb(a)rpmfusion.org>:
commit 580f919341f903be8383f4159a5b47b3d0c78dd2
Merge: 3673a38 2d1568a
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Nov 22 23:35:20 2016 +0000
Merge branch 'el7'
HOW IS THAT even possible that you merge back and
forth el7 branch to devel.
STOP doing that this is totally insane!
--
-
Nicolas (kwizart)
12:43 p.m.
New subject: [akmods: 3/3] Merge branch 'el7'
2016-11-23 13:40 GMT+01:00 Nicolas Chauvet <kwizart(a)gmail.com>:
2016-11-23 0:38 GMT+01:00 Sérgio M. Basto
<sergiomb(a)rpmfusion.org>:
> commit 580f919341f903be8383f4159a5b47b3d0c78dd2
> Merge: 3673a38 2d1568a
> Author: Sérgio M. Basto <sergio(a)serjux.com>
> Date: Tue Nov 22 23:35:20 2016 +0000
>
> Merge branch 'el7'
HOW IS THAT even possible that you merge back and forth el7 branch to devel.
STOP doing that this is totally insane!
--
-
Nicolas (kwizart)
12:46 p.m.
New subject: [akmods: 3/3] Merge branch 'el7'
On Wednesday, 23 November 2016 at 13:40, Nicolas Chauvet wrote:
2016-11-23 0:38 GMT+01:00 Sérgio M. Basto
<sergiomb(a)rpmfusion.org>:
> commit 580f919341f903be8383f4159a5b47b3d0c78dd2
> Merge: 3673a38 2d1568a
> Author: Sérgio M. Basto <sergio(a)serjux.com>
> Date: Tue Nov 22 23:35:20 2016 +0000
>
> Merge branch 'el7'
HOW IS THAT even possible that you merge back and forth el7 branch to devel.
STOP doing that this is totally insane!
Only fast-forward merges should be done from non-master branches to
master. Otherwise we're getting junk "merge commits" unnecessarily.
Regards,
Dominik
--
Fedora http://fedoraproject.org/wiki/User:Rathann
RPMFusion http://rpmfusion.org
"Faith manages."
-- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"
1:09 p.m.
New subject: [akmods: 3/3] Merge branch 'el7'
2016-11-23 13:46 GMT+01:00 Dominik 'Rathann' Mierzejewski
<dominik(a)greysector.net>:
On Wednesday, 23 November 2016 at 13:40, Nicolas Chauvet wrote:
> 2016-11-23 0:38 GMT+01:00 Sérgio M. Basto <sergiomb(a)rpmfusion.org>:
> > commit 580f919341f903be8383f4159a5b47b3d0c78dd2
> > Merge: 3673a38 2d1568a
> > Author: Sérgio M. Basto <sergio(a)serjux.com>
> > Date: Tue Nov 22 23:35:20 2016 +0000
> >
> > Merge branch 'el7'
> HOW IS THAT even possible that you merge back and forth el7 branch to devel.
> STOP doing that this is totally insane!
Only fast-forward merges should be done from non-master branches to
master. Otherwise we're getting junk "merge commits" unnecessarily.
Well, I would even say don't even merge anything "TO" master. Master
is the main branch for development, so there are no reason that any
commit isn't there first if relevant.
If you have diverged from master, you cannot merge anymore, only
cherry-pick the commit or range you wan't back to your particular
branch.
@sergio,
Please re-do another clone for akmod, I've cleaned this change
--
-
Nicolas (kwizart)
1:26 p.m.
New subject: [akmods: 3/3] Merge branch 'el7'
On Qua, 2016-11-23 at 14:09 +0100, Nicolas Chauvet wrote:
2016-11-23 13:46 GMT+01:00 Dominik 'Rathann' Mierzejewski
<dominik(a)greysector.net>:
>
> On Wednesday, 23 November 2016 at 13:40, Nicolas Chauvet wrote:
> >
> > 2016-11-23 0:38 GMT+01:00 Sérgio M. Basto <sergiomb(a)rpmfusion.org
> > >:
> > >
> > > commit 580f919341f903be8383f4159a5b47b3d0c78dd2
> > > Merge: 3673a38 2d1568a
> > > Author: Sérgio M. Basto <sergio(a)serjux.com>
> > > Date: Tue Nov 22 23:35:20 2016 +0000
> > >
> > > Merge branch 'el7'
> > HOW IS THAT even possible that you merge back and forth el7
> > branch to devel.
> > STOP doing that this is totally insane!
> Only fast-forward merges should be done from non-master branches to
> master. Otherwise we're getting junk "merge commits" unnecessarily.
Well, I would even say don't even merge anything "TO" master. Master
is the main branch for development, so there are no reason that any
commit isn't there first if relevant.
If you have diverged from master, you cannot merge anymore, only
cherry-pick the commit or range you wan't back to your particular
branch.
@sergio,
Please re-do another clone for akmod, I've cleaned this change
what commands did you use to fix akmods NonFastForward ?
NonFastForward
--
Sérgio M. B.
1:52 p.m.
New subject: [akmods: 3/3] Merge branch 'el7'
On Qua, 2016-11-23 at 13:26 +0000, Sérgio Basto wrote:
On Qua, 2016-11-23 at 14:09 +0100, Nicolas Chauvet wrote:
>
> 2016-11-23 13:46 GMT+01:00 Dominik 'Rathann' Mierzejewski
> <dominik(a)greysector.net>:
> >
> >
> > On Wednesday, 23 November 2016 at 13:40, Nicolas Chauvet wrote:
> > >
> > >
> > > 2016-11-23 0:38 GMT+01:00 Sérgio M. Basto <sergiomb(a)rpmfusion.o
> > > rg
> > > >
> > > > :
> > > >
> > > > commit 580f919341f903be8383f4159a5b47b3d0c78dd2
> > > > Merge: 3673a38 2d1568a
> > > > Author: Sérgio M. Basto <sergio(a)serjux.com>
> > > > Date: Tue Nov 22 23:35:20 2016 +0000
> > > >
> > > > Merge branch 'el7'
> > > HOW IS THAT even possible that you merge back and forth el7
> > > branch to devel.
> > > STOP doing that this is totally insane!
> > Only fast-forward merges should be done from non-master branches
> > to
> > master. Otherwise we're getting junk "merge commits"
> > unnecessarily.
> Well, I would even say don't even merge anything "TO" master.
> Master
> is the main branch for development, so there are no reason that any
> commit isn't there first if relevant.
> If you have diverged from master, you cannot merge anymore, only
> cherry-pick the commit or range you wan't back to your particular
> branch.
>
>
> @sergio,
> Please re-do another clone for akmod, I've cleaned this change
what commands did you use to fix akmods NonFastForward ?
I could test with f20 , which had the same last commit of el7 and
git checkout f20
git rebase origin/master (choose ignore changes)
git status
and have 24 and 1 different commit each, respectively.
so we need
git push --force
I don't have permissions, neither I want it, I think we may leave with
merges and without force updates ...
I had done 3 commits :
1 . https://pkgs.rpmfusion.org/cgit/free/akmods.git/commit/?id=2d1568a
9a177b5651d35cd42437d4afee192f108
with Diffstat 0 files changed, 0 insertions, 0 deletions
which I put el7 with same hash of master code of 2015-04-08, before
they had the same code but they had different hashes .
2. Now I can merge master into el7 with fast-forward. ( git checkout
el7; git merge master )
3. merge, only the hash el7, with Diffstat 0 files changed, 0
insertions, 0 deletions, so now on all branches are in same tree.
(git checkout master ; git merge el7)
>
> NonFastForward
>
--
Sérgio M. B.
7 p.m.
New subject: [akmods: 3/3] Merge branch 'el7'
On Qua, 2016-11-23 at 14:09 +0100, Nicolas Chauvet wrote:
2016-11-23 13:46 GMT+01:00 Dominik 'Rathann' Mierzejewski
<dominik(a)greysector.net>:
>
> On Wednesday, 23 November 2016 at 13:40, Nicolas Chauvet wrote:
> >
> > 2016-11-23 0:38 GMT+01:00 Sérgio M. Basto <sergiomb(a)rpmfusion.org
> > >:
> > >
> > > commit 580f919341f903be8383f4159a5b47b3d0c78dd2
> > > Merge: 3673a38 2d1568a
> > > Author: Sérgio M. Basto <sergio(a)serjux.com>
> > > Date: Tue Nov 22 23:35:20 2016 +0000
> > >
> > > Merge branch 'el7'
> > HOW IS THAT even possible that you merge back and forth el7
> > branch to devel.
> > STOP doing that this is totally insane!
> Only fast-forward merges should be done from non-master branches to
> master. Otherwise we're getting junk "merge commits" unnecessarily.
Well, I would even say don't even merge anything "TO" master. Master
is the main branch for development, so there are no reason that any
commit isn't there first if relevant.
If you have diverged from master, you cannot merge anymore, only
cherry-pick the commit or range you wan't back to your particular
branch.
We still have some packages , that we cannot merge anymore and can be
fixed by merging branch into master as explain by others in this
thread.
what is the state of this thread ?, like also was point out rebase
needs a git push --force .
Also this is a minor detail, I don't want spend much energy on this
subject, but I'd like know if I'm authorized (again) or not to fix git
repos to have fast-forward (merge) again ?
Thanks,
--
Sérgio M. B.
2 a.m.
New subject: [akmods: 3/3] Merge branch 'el7'
Dominik 'Rathann' Mierzejewski wrote:
Only fast-forward merges should be done from non-master branches to
master. Otherwise we're getting junk "merge commits" unnecessarily.
A single bidirectional merge is actually the most effective way to make the
branches fast-forwardable again and avoid any future such merge commits. I
always do that if somebody breaks fast-forwardability in my packages.
The idea is, you merge master into el7, creating one last "Merge master into
el7" merge commit, then you merge el7 fast-forward into master, which fast-
forwards master to that merge commit. It makes the history in master a bit
more messy, but it avoids polluting the branch history with more unnecessary
merge commits in the future.
And the fault for the messy master history lies not with whom did the
bidirectional merge, but with whom made the branches diverge to begin with.
Kevin Kofler
2942
days inactive
2948
days old
rpmfusion-developers@lists.rpmfusion.org
7 comments
4 participants
participants (4)
-
Dominik 'Rathann' Mierzejewski -
Kevin Kofler -
Nicolas Chauvet -
Sérgio Basto