Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,370,158
Community Members
 
Community Events
168
Community Groups

Crucible tried to anchor your patch, but there was conflicting content

I'm trying to use Crucible with CVS for precommit review. When I upload the patch, it says

Crucible tried to anchor your patch, but there was conflicting content 

All my files have keyword tag $Log: NameOfTheFile.java,v $ and this seems to be the culprit. If I remove the tag and commit, the problem goes away -- I can upload precommit patches to Crucible. However I do not want to remove all the keyword tags from my files.

Is there any other work-around? One page says I can manually edit the diff. How??

2 answers

1 accepted

0 votes
Answer accepted

Note, I found another work-around. I can create the patch with "cvs diff -u10000 [files] >patch" and that will upload the entire source file instead of just 3 lines context. The anchor still fails, but at least I can view the entire file. However, I would still like to know how to "edit the diff" to avoid the anchor failure.

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events