Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

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.py conflicting content when svn:mergeinfo changes

Using Atlassian FishEye analysis with Crucible code review. (Version:4.4.0 Build:20170412122150 2017-04-12). Note that I added a "Console.error(error_body)" line after the "Failed to anchor" line in crucible.py.

$ svn diff folder --depth empty
Index: folder
===================================================================
--- folder (revision 245606)
+++ folder (working copy)

Property changes on: folder
___________________________________________________________________
Modified: svn:mergeinfo
Merged /folder:r229420
$ svn diff folder --depth empty > temp
$ crucible.py APREV -r XXX -f temp
...
Error: Failed to anchor the patch to repository XXX, please check that the repository is the correct one
{u'message': u"Unable to anchor patch [APREV-27-patch-0.txt] to repository [XXX]: Crucible tried to anchor your patch to 'XXX', but there was conflicting content in 'folder' at revision '244550'.", u'code': u'PatchAnchorFailed'}
$ svn diff -c 244550 folder --depth empty
Index: folder
===================================================================
--- folder (revision 244549)
+++ folder (revision 244550)

Property changes on: folder
___________________________________________________________________
Modified: svn:mergeinfo
Merged /folder:r240714,242943

1 answer

0 votes
Lonnie Atlassian Team Jun 02, 2017

Hi, As a test if you run crucible.py from within the repo and provide options. Are you able to connect and enter the requested information? Does that anchor to the Review?

 

I am not sure but it seems like you had a folder named "folder" then removed it and added it back. Is that correct? Get the full diff and try to anchor it.

 

Thanks 

Lonnie

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Jira Service Management

Security Advisory for Jira Service Management

On October 20, 2021, Atlassian published a security advisory for Jira Service Management. The full advisory is available at this link.  We've seen a number of questions already asking for...

56 views 0 1
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