Looks like the commandline formatting is wrong and mercurial is unusable with sourcetree at the moment (latest win7 version at time of writing).
The revision seems to be missing the -r prefix in the command line for hg merge and so returns with an error.
Yes, actually I noticed the -r is optional so I wonder what is causing this problem?
We have largefiles and an extension to allow japanese filenames (utf8), but disabling both these extensions doesn't change the behaviour, and neither does using the internal mercurial.
We do have the more standard extensions, rebase and mq enabled, could it be one of these? They all say sourcetree internal though so I presume they are safe?
Hey team! I'm Cameron Deatsch, Head of Server at Atlassian. I'll be hosting an AMA over in our Questions section of the Community next Monday, so shoot me your questions, upvote others' question...
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!
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