DevHeads.net

NepomukCore - Do not merge KDE/4.10 into master

Hey everyone

As you might have heard there was a fiasco in the nepomuk-core repository
where the 'master' branch was accidentally merged into KDE/4.10. Since then
the system admins had to do a hard reset to v4.10.2 and I had to manually
cherry-pick a lot of the commits.

I do not want anyone to merge KDE/4.10 into master. It will lead will a
number of duplicate commits, and considering we already have a LOT of
duplicates I do not want any more.

Thanks

Comments

Re: NepomukCore - Do not merge KDE/4.10 into master

By Albert Astals Cid at 05/06/2013 - 18:30

El Dissabte, 4 de maig de 2013, a les 14:01:45, Vishesh Handa va escriure:
Can't you just merge the branches, then rebase -i and in the rebase actually
remove all the duplicated commits?

Asking for people not to merge is hard, people won't read this, so either you
enforce it somehow or merge it first like i said and make sure you "kill" the
duplicate commits.

Cheers,
Alert

Re: NepomukCore - Do not merge KDE/4.10 into master

By Rolf Eike Beer at 05/07/2013 - 15:50

Am Dienstag, 7. Mai 2013, 00:30:25 schrieb Albert Astals Cid:
You probably meant

git checkout master
git merge -s ours KDE/4.10

Eike

Re: NepomukCore - Do not merge KDE/4.10 into master

By =?UTF-8?Q?Nicol... at 05/06/2013 - 18:37

2013/5/6 Albert Astals Cid < ... at kde dot org>

What would that achieve? If you rebase, the history becomes linear and the
merge stops being a merge.

Re: NepomukCore - Do not merge KDE/4.10 into master

By Albert Astals Cid at 05/06/2013 - 18:40

El Dilluns, 6 de maig de 2013, a les 19:37:15, Nicolás Alvarez va escriure:
This gives you a master branch where KDE/4.10 has already been merged (so next
merges don't bring in all the new duplicate commits) and has no duplicate
commits (since you killed them in the rebase -i).

Cheers,
Albert

Re: NepomukCore - Do not merge KDE/4.10 into master

By =?UTF-8?Q?Nicol... at 05/06/2013 - 18:49

2013/5/6 Albert Astals Cid < ... at kde dot org>

rebase will linearize the history, removing the merge commit, which means
4.10 won't be recorded as "already been merged" anymore.

Re: NepomukCore - Do not merge KDE/4.10 into master

By Albert Astals Cid at 05/06/2013 - 18:54

El Dilluns, 6 de maig de 2013, a les 19:49:13, Nicolás Alvarez va escriure:
I've done it in the poppler repo, and it has worked.

Cheers,
Albert

Re: NepomukCore - Do not merge KDE/4.10 into master

By Albert Astals Cid at 05/06/2013 - 19:12

El Dimarts, 7 de maig de 2013, a les 00:54:20, Albert Astals Cid va escriure:
Or maybe it has not. Sorry for the noise.

Cheers,
Albert

Re: NepomukCore - Do not merge KDE/4.10 into master

By Andreas Pakulat at 05/04/2013 - 07:47

Hi,

You have the duplicate commits anyway, merging the branch will not increase
their number. It also means you'll have to cherry-pick each bugfix done to
the KDE/4.10 branch manually into master, while merging gives you that for
free.

If the cherry-picked commits applied cleanly in KDE/4.10 when you
cherry-picked them, then merging KDE/4.10 into master will not generate
conflicts.

Andreas