Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
Level
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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
Community showcase
Published in Jira Service Management

ThinkTilt is joining the Atlassian Family!

This morning, Atlassian announced the acquisition of ThinkTilt , the maker of ProForma, a no-code/low code form builder with 700+ customers worldwide. ThinkTilt helps IT empower any team in their or...

283 views 16 17
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you