-
Bug
-
Resolution: Handled by Support
-
Medium
-
None
-
2.7.12
-
None
-
None
-
Standalone server.
FishEye: 2.7.12 20120322030402 Crucible: 2.7.12 20120322030402
Java Version: 1.6.0_17 Java Vendor: Sun Microsystems Inc. JVM Version: 1.0 JVM Vendor: Sun Microsystems Inc. JVM Impl Version: 14.0-b16 Java Runtime: OpenJDK Runtime Environment Java VM: OpenJDK 64-Bit Server VM Operating System: Linux 2.6.33.3-85.fc13.x86_64
Standalone server. FishEye: 2.7.12 20120322030402 Crucible: 2.7.12 20120322030402 Java Version: 1.6.0_17 Java Vendor: Sun Microsystems Inc. JVM Version: 1.0 JVM Vendor: Sun Microsystems Inc. JVM Impl Version: 14.0-b16 Java Runtime: OpenJDK Runtime Environment Java VM: OpenJDK 64-Bit Server VM Operating System: Linux 2.6.33.3-85.fc13.x86_64
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.
- is related to
-
-
- Closed
-
