[mythtv] conflict resolution
Bruce Markey
bjm at lvcm.com
Thu Nov 6 18:27:40 EST 2003
David Engel wrote:
> On Wed, Nov 05, 2003 at 03:42:52PM -0600, David Engel wrote:
>
>>Here is my first cut at it.
>
>
> Here's a slightly revised version that changes the following.
>
> Inlcudes Bruce's fixes for my orignal patch.
>
> Doesn't ignore overrides for SingleRecords. I first thought ignoring
> them was desirable but now think it would be confusing for users.
>
> Fixes the override dialogs in viewscheduled to properly handle escape.
I think the comma after the quote shouldn't be there.
+" subtitle VARCHAR(128) NULL, ",
remove this ----^
If you look at the other things in dbcheck, the comma after
the quote is only added at the end of a complete statement.
Also, you should probably detabify your stuff for Isaac.
-- bjm
More information about the mythtv-dev
mailing list