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

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
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Published Thursday in Marketplace Apps

Tips on how to choose the best estimation method for your planning

Planning and grooming sessions all come with their own sets of rules. Team members meet to estimate stories or other work items, all according to an agreed-upon process. And with every session comes ...

74 views 0 11
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you