Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-4663

Tree conflict problem when merging two branches

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: 1.9.4, 1.9.5
    • Fix Version/s: 1.10.0
    • Component/s: None
    • Labels:
      None
    • Environment:

      Windows, TortoiseSVN, Command line

      Description

      Bug confirmed by Branko Čibej <brane@apache.org> on users mailing list.

      Quick verbal description of how to recreate the issue:

      -Create a repository (with trunk/tags/branches structure),
      -Checkout /trunk,
      -Create branch1 in /branches/branch1, and checkout.
      -Create and checkout branch2.
      -Create file.txt in Trunk + add + commit.
      -Merge trunk changes into branch1 and commit.
      -Merge trunk changes into branch2 and commit.

      The problem:
      -Merge branch1 changes into branch2, gives me a Tree conflict with file.txt.

        Attachments

        1. repeat.sh
          0.7 kB
          André Roy
        2. transcript-1.9.4.txt
          2 kB
          André Roy
        3. transcript-trunk.sh
          3 kB
          André Roy

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              andre@dsa-ltd.ca André Roy
            • Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: