master pushed to KDE/4.9

[Martin Gräßlin]

On Monday 09 July 2012 22:29:59 Marco Martin wrote:
> On Monday 09 July 2012, Viranch Mehta wrote:
> > Hi,
> > 
> > While I was trying to push my commit to KDE/4.9 after pushing to master,
> > I landed pushing all of master to KDE/4.9 branch. I was asked to give a
> > request for reverting this to the project's git maintainers.
> > 
> > So can someone please look into this? My apologies for the inconvenience.
> > 
> > Cheers,
> > Viranch
> 
> is it kde-workspace? did you do a merge of master into 4.9?
> 
> seems there is a merge at 6e34d9b604240bda7d6ebdc46ff12470c8f17b9f
no that was my proper merge from 4.9 into master.

If you look at git-gui it really looks like master got merged into 4.9 or look 
at http://quickgit.kde.org/index.php?p=kde-
workspace.git&a=commit&h=d7b04c0732c538957aa8a2bf9d53bd98a61eab13

which shows that this commit is currently HEAD of master and KDE/4.9

relevant part of IRC log:
[21:35] <xardas008> viranch: i think you need to merge it to your local 
KDE/4.9 branch first before you can push it
[21:36] <-- notmart has left this server (Quit: notmart terminated!).
[21:38] <viranch> xardas008: git merge master?
[21:38] <xardas008> viranch: yes
[21:39] <xardas008> you need to call git checkout KDE/4.9 first 
[21:39] <xardas008> and then the merge
[21:39] <mgraesslin> NOOOOOOO
[21:39] <xardas008> not?
[21:39] <mgraesslin> don't merge master into KDE/4.9
[21:39] <-- faichele_ has left this server (Remote host closed the 
connection).
[21:39] <xardas008> ok :)
[21:40] <mgraesslin> that would bring everything from master to 4.9 branch
[21:40] <mgraesslin> the proper way would have been to first push to KDE/4.9 
and then merge KDE/4.9 into master
[21:40] <viranch> woah!!!
[21:41] <viranch> did it just get pushed?!

I still hope my git foo is completely wrong and there is no merge to master 
:-)

Anyway, in case someone wants to fix it: https://condor-
wiki.cs.wisc.edu/index.cgi/wiki?p=RevertingBadMerges

short summary: just reverting the merge is not enough, won't work and will 
create even more mess. Probably the only real solution is either revert the 
individual commits or force push.

Cheers
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20120709/9c0fa917/attachment.sig>