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

Close

#15 Allow WinMerge to merge CVS conflict files

closed-fixed
Kimmo Varis
6
2008-01-23
2001-06-26
Anonymous
No

It would be usefull if WinMerge could parse a CVS
conflict file and allow users to visual merge the file.

Discussion

  • Logged In: NO

    I find this useful too. For me CVS support is very important.

     
  • Kimmo Varis
    Kimmo Varis
    2003-09-15

    Logged In: YES
    user_id=631874

    Parsing confllict and creating two files for merging sound
    like a good canditate for script. Laoran is working with
    adding scripting support for 2.1.

     
  • Luca Orlandi
    Luca Orlandi
    2003-09-22

    Logged In: YES
    user_id=478323

    I would LOVE real CVS integration too. Is anybody already
    working on it?

     
  • Kimmo Varis
    Kimmo Varis
    2003-09-22

    Logged In: YES
    user_id=631874

    Nobodys working with this as far as I know of.

     
  • Logged In: NO

    I would LOVE this, too! Found no other Win-Tool that can
    handle CVS conflicts :(...

     
  • Kimmo Varis
    Kimmo Varis
    2003-09-24

    Logged In: YES
    user_id=631874

    It would help *a lot* if somebody has a time to write code
    to parse conflict file. Parameters:
    - 3 filenames: 1) original file to parse and 2,3) filenames
    of result files

    I can help with UI part and integration to WinMerge later.

     
  • Kimmo Varis
    Kimmo Varis
    2003-09-24

    • priority: 5 --> 6
     
  • Perry
    Perry
    2003-11-21

    Logged In: YES
    user_id=60964

    TortoiseCVS already does this -- parses conflict files into
    two files showing both versions (and then it invokes the
    registered merge application).

    It uses a function called

    bool ConflictParser::ParseFile

    taking 4 arguments:

    const std::string& sConflictFileName,
    const std::string& sWorkingCopyFileName,
    std::string& sNewRevisionFileName,
    bool& bNestedConflicts

    in src/TortoiseAct/ConflictParser.cpp

    It uses STL strings & iostreams, and an iterator named
    LineReader (which must do the obvious thing -- read one line
    at a time).

    [Submitting this for posterity, meaning for anyone with the
    interest in turning this into a working patch.]

     
  • Kimmo Varis
    Kimmo Varis
    2004-03-19

    • summary: Allow WinMerge to merged CVS conflicts. --> Allow WinMerge to merge CVS conflict files
     
  • Kimmo Varis
    Kimmo Varis
    2004-03-19

    Logged In: YES
    user_id=631874

    Tweaking summary a bit to make it easier to find: "Allow
    WinMerge to merge CVS conflict files".

     
  • alan johnson
    alan johnson
    2004-03-24

    Logged In: YES
    user_id=943591

    this may be useful i think

     
  • Perry
    Perry
    2004-04-19

    Logged In: YES
    user_id=60964

    ConflictEditor project's newest file release is from 2002;
    is that because it is very stable, or because it is somewhat
    dead?

     
  • Oliver Giesen
    Oliver Giesen
    2006-10-06

    Logged In: YES
    user_id=158827

    Another "Me Too" from here. This would be really useful.

    And yes, ConflictEditor is dead, I think. It also wasn't
    really useful to begin with. IIRC it didn't even have
    sync'ed scrolling of the two panes...

     
  • Kimmo Varis
    Kimmo Varis
    2006-10-06

    • labels: --> File handling
     
  • Kimmo Varis
    Kimmo Varis
    2008-01-17

    Logged In: YES
    user_id=631874
    Originator: NO

    I'm considering implementing this in near future. I've been using many different version control systems lately and seen way too many conflict files I've had to resolve with text editor.

    I can't promise anything yet, but I'll assign this item to myself.

     
  • Kimmo Varis
    Kimmo Varis
    2008-01-17

    • assigned_to: nobody --> kimmov
     
  • Kimmo Varis
    Kimmo Varis
    2008-01-18

    Logged In: YES
    user_id=631874
    Originator: NO

    I have good news.

    I just committed to my local repository first really working version of conflict file resolving. GUI is not yet finished, but so far it looks good for functionality. Big thanks of course to TortoiseCVS guys, as I converted their conflict file parsing code to WinMerge. I'll submit a patch to tracker in couple of hours and will commit to our repository in few days. This will be in next experimental.

     
  • Kimmo Varis
    Kimmo Varis
    2008-01-19

    Logged In: YES
    user_id=631874
    Originator: NO

    Patch submitted:
    #1875129 Resolve conflict files
    http://winmerge.org/patch/1875129

     
  • Kimmo Varis
    Kimmo Varis
    2008-01-23

    Logged In: YES
    user_id=631874
    Originator: NO

    This is now available in 2.7.7.3 experimental release, so I'm closing this item.

    Improvement requests and bugs reports should be submitted as new tracker items.

     
  • Kimmo Varis
    Kimmo Varis
    2008-01-23

    • status: open --> closed-fixed