Uploaded image for project: 'Crucible'
  1. Crucible
  2. CRUC-6235

Patch anchoring and conflicting content

    XMLWordPrintable

Details

    • Bug
    • Resolution: Handled by Support
    • Medium
    • None
    • 2.7.12
    • None
    • None

    Description

      Trying to create a pre-commit review with the result of `svn diff`. When I select the .diff from the file manager and click upload, I get a message similar to:

      Crucible tried to anchor your patch to 'TREE', but there 
      was conflicting content in 'path/to/file.h' at revision '123' 
      

      There is no indication of what course of action needs to be taken to resolve this type of issue in the logs or the message itself that I've found.

      Currently there is no workaround that I've found other than mailing around a .diff to the intended reviewers. Arguably, this is not actually a workaround with regards to a usable Crucible/Fisheye.

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              e954e210d942 Ken Ko
              Votes:
              0 Vote for this issue
              Watchers:
              5 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: