SourceTree hg merge - Unknown Command error

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.

5 answers

Here is the exact error: (with both internal mercurial or external mercurial)

hg merge -y ui.merge=internal:merge 27321

hg: unknown command '27321'

No response? It's impossible to use sourcetree with mercurial at the moment because of this problem.

I've pinged Steve who'll get back to you shortly. Sorry for the delay!

The '-r' is actually optional (see hg merge --help) - I don't have any issues merging with SourceTree with either the embedded or system hg. Do you have any custom extensions enabled?

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?

Anyone have any ideas? We are in a Japanese environment, is this causing a problem? (codepage?)

Suggest an answer

Log in or Join to answer
Community showcase
Louis De Jaeger
Posted yesterday in Off-topic

Friday fun: your best joke

Hi all Lets make this Friday fun really fun and post one (or more) of your best jokes! The joke can be about an Atlassian product, or just a really fun joke you want to share! I’m not the best j...

157 views 12 3
Join discussion

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
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot