[PySide] About the next PySide release

[Hugo Parente Lima]

On Friday 09 March 2012 10:14:25 Matti Airas wrote:
> On 09.03.2012 15:12, ext Anderson Lizardo wrote:
> > On Fri, Mar 9, 2012 at 8:40 AM, Matti Airas<matti.p.airas at nokia.com>  
wrote:
> >> BTW, how did you actually do the removal? Did you just branch the repos
> >> before the offending commits and then merge all commits except the
> >> offending ones?
> > 
> > I wonder if a  " git rebase -i commit_id^ " (where "commit_id" is the
> > commit to be removed) and removing the line on the interactive rebase
> > editor, would fix this more or less easily :)
> 
> That was the approach I tried, but that breaks down in merges. Couldn't
> quite figure out what the exact problem was, though.

I did

git rebase -i --preserve-merges commit_id~1

Removed the commit and went on fixing the conflicts taking care to not 
recreate the fix done by the removed commit by mistake.

I guess just one merge of shiboken had problems and went "inlined", the other 
were preserved as well.
 
> Cheers,
> 
> ma.

-- 
Hugo Parente Lima
INdT - Instituto Nokia de Tecnologia
-------------- 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://lists.qt-project.org/pipermail/pyside/attachments/20120309/9eaf8b2f/attachment.sig>