Unity

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

  1. unity.fix-852582
  2. Merge into trunk
Proposed by Tim Penhey
Status: Rejected
Rejected by: Omer Akram
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 Pending
Review via email: mp+80977@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

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

Revision history for this message
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
1726. By Mirco Müller

Merged with trunk and fixed conflicts

Revision history for this message
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?

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

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

Revision history for this message
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

Merged with trunk and fixed conflicts

1725. By Mirco Müller

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

Preview Diff

Empty