Uploaded image for project: 'BlueJ'
  1. BlueJ
  2. BLUEJ-621

SVN does not properly handle conflicts where a file was locally modified and remotelly deleted.

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Medium
    • Resolution: Done
    • Affects Version/s: 3.1.5, 3.1.6, 3.1.7
    • Fix Version/s: 4.1.3
    • Component/s: Teamwork
    • Sprint:
      BlueJ 4.1.3

      Description

      When using SVN, when a file was locally modified and remotelly deleted, BlueJ correctly displays the conflict, asking the user to choose wich version of the file they wish to keep (local or repository).

      -When selecting the repository version, the file is not deleted and the user cannot commit or update.

      -When selecting my version, it works as it should.

        Attachments

          Activity

            People

            • Assignee:
              nccb Neil Brown
              Reporter:
              fheday Fabio Hedayioglu (Inactive)
            • Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: