Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

#350 Fix comparisons for file comparisons

closed-rejected
Perry
None
5
2003-10-08
2003-10-08
Perry
No

#1) Wipe the diffcontext dirlist when doing a file compare.

#2) Check for empty diffcontext & bail out of
UpdateItemStatus in that case.

Discussion

  • ganier
    ganier
    2003-10-08

    Logged In: YES
    user_id=804270

    Kimmo is right. Dirdoc gets updated because it is not empty,
    and that is a bug.
    An empty Dirdoc has no m_pCtxt (and no m_pFilter), not
    even an empty m_pCtxt.
    My suggestion is to delete both m_pCtxt and m_pFilter (in
    CDirDoc::ReusingDirDoc).

     
  • Perry
    Perry
    2003-10-08

    Logged In: YES
    user_id=60964

    My thought is that the bug is not about empty dirdocs (I
    think that CMergeDoc::OnFileSave already handles them
    correctly), but about nonempty dirdocs.

    I don't like clearing things in ReusingDirDoc because if the
    user cancels a dirty save, I think everything should stay
    unchanged.

    Actually I'm not thrilled with ReusingDirDoc calling
    "m_pDirView->DeleteAllDisplayItems" (which it does now),
    because now we have the phenomenon that if you push the open
    button, then cancel the open dialog, all your previous diff
    is gone. I'm not entirely thrilled with that. But, the other
    way would be to wait and clear after you push Ok on the open
    dialog, which would leave all the diff listing in the dirdoc
    visible behind the file open dialog you're filling out (and
    I'm not sure I like that either). I'm not sure what I think.
    What do you think ?

     
  • Perry
    Perry
    2003-10-08

    • status: open --> closed
     
  • Perry
    Perry
    2003-10-08

    • assigned_to: nobody --> puddle
    • status: closed --> closed-rejected
     
  • Perry
    Perry
    2003-10-08

    Logged In: YES
    user_id=60964

    I'm going to mark this patch rejected. Right now we're
    clearing all display items in ReusingDirDoc, so we may as
    well delete the diff context there as well. To change that
    procedure would be a different issue than solving the
    outstanding bug.