[mythtv] [mythtv-commits] Ticket #7731: Delay file deletion in mythtranscode

[Jim Stichnoth]

On Sun, Dec 13, 2009 at 4:31 PM, Michael T. Dean
<mtdean at thirdcontact.com> wrote:
> On 12/13/2009 05:29 PM, MythTV wrote:
>>
>> #7731: Delay file deletion in mythtranscode
>>
>>
>> Comment(by stichnot@…):
>>
>>  At Mike Dean's challenge, I updated the patch to also do something
>>  sensible with an existing bookmark when a cutlist is present, rather than
>>  just clearing it.
>
> Jim, any chance you could split the 2 features and post the "update bookmark
> after transcode" patch on a separate ticket.  Since these are really 2
> separate features (though both related to transcode), separating them will
> make it easier to review and test--and, if nothing else, having a ticket
> summary that describes the new "update bookmark" feature will make tracking
> changes much easier.

I went ahead and created two separate patches based on the same
original file from trunk.  However, there are conflicts between the
two that the patch program doesn't like -- regardless of the order the
patches are applied, the second patch attempt gives at least one "hunk
failed" message.  The reason is that the "delay file deletion" patch
moves a chunk of database update code (from after the file deletion to
a point just before the deletion), while the "update bookmark" patch
modifies this database update code.

Any suggestions on how to deal with this?  It would be nice to create
a better structural patch that conveys the fact that a chunk of code
has actually been removed, rather than deleted in one place and
inserted in another.

Jim