Merge lp:~macslow/unity/unity.fix-852582 into lp:unity

Proposed by Tim Penhey on 2011-11-02
Status: Rejected
Rejected by: Omer Akram on 2012-09-13
Proposed branch: lp:~macslow/unity/unity.fix-852582
Merge into: lp:unity
Diff against target: 0 lines
To merge this branch: bzr merge lp:~macslow/unity/unity.fix-852582
Reviewer Review Type Date Requested Status
Unity Team 2011-11-02 Pending
Review via email: mp+80977@code.launchpad.net
To post a comment you must log in.
Tim Penhey (thumper) wrote :

Mirco, can you merge trunk? I'm wondering if I had managed to fix this in my refactoring.

Mirco Müller (macslow) wrote :

Just sitting here at UDS right now and seeing to fix the merge-conflict. Looks like this issue was fixed with you merged refactoring work, after I started with a copy of unity trunk before that.

lp:~macslow/unity/unity.fix-852582 updated on 2011-11-02
1726. By Mirco Müller on 2011-11-02

Merged with trunk and fixed conflicts

Tim Penhey (thumper) wrote :

Mirco, my branch was too big to go in as an SRU. Could you propose the fix for the SRU branch?

Sam Spilsbury (smspillaz) wrote :

I'm dropping this proposal since this code has already been merged into trunk.

Omer Akram (om26er) wrote :

there's nothing to be merged here, plus the related bug is marked fixed. Rejecting.

Unmerged revisions

1726. By Mirco Müller on 2011-11-02

Merged with trunk and fixed conflicts

1725. By Mirco Müller on 2011-10-25

Check pointers in destructor before calling unref on them. Fixes LP: #852582

Preview Diff

Empty