JetBrains 2024.1 regression - IDE's directory diff tool loses last path separator when synchronizing retrieved files

Issue #2553 resolved
Vitali Kunts created an issue

Some days ago the merging tool started working badly. When I retrieve any new metadata item or merge the whole file (from left to right) it copies files to the one level-up folder and adds the metadata folder name to the file name.

Please see an example in the attachment.

Official response

Comments (10)

  1. Scott Wells repo owner
    • changed status to open

    Hi. Thank you for reporting this. I heard about it from another user but haven't gotten useful diagnostic information yet. Can you please enable debug logging for Metadata Retrieval and Salesforce DX, reproduce the behavior, and either attach or email the resulting idea.log file for review?

  2. Scott Wells repo owner

    Thank you. I can see in the log where it retrieves the file with the correct path and then copies it into the diff directory structure. I’ve seen in a screenshot from another user where the diff directory structure is correct, but using the IDE’s directory diff tool to copy it into the project directory structure seems to lose the last path separator. If so, that would be a bug in the IDE’s directory diff tool. I’m going to see if I can reproduce that locally shortly and, if so, I’ll log a bug in the JetBrains issue tracker and provide a link here.

  3. Scott Wells repo owner

    Confirmed as a bug in the JetBrains 2024.1 IDEs and logged accordingly:

    https://youtrack.jetbrains.com/issue/IDEA-352091

    The only workarounds that come to mind until this is fixed – and my guess is that it will be fixed in short order – are:

    1. Roll back to 2023.3 which does not evidence the issue.
    2. Configure the IDE for an external diff tool such as Beyond Compare, Araxis Merge, Meld, KDiff3, WinDiff/WinMerge, etc. I personally use Beyond Compare, but it and Araxis Merge are both commercial vs. numerous free options.

  4. Scott Wells repo owner

    Technically this can/should be resolved, but to make it more visible to other users who encounter the same issue, I’ll leave it open until a fix is delivered by JetBrains.

  5. Vitali Kunts reporter

    Thank you Scott for the detailed and clear response!

    Fortunately, I don’t merge a lot now, will wait for a fix from JetBrains.

    Have a great day!

  6. Scott Wells repo owner

    The linked JetBrains issue has been marked as fixed for delivery in an upcoming patch. Resolving the placeholder issue here.

  7. Log in to comment