SourceTree hg merge - Unknown Command error

[Dylan Cuthbert]

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.

[Dylan Cuthbert]

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

[Dylan Cuthbert]

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?

[stevestreeting]

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?

[Dylan Cuthbert]

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

[KieranA]

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

[Dylan Cuthbert]

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

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

hg: unknown command '27321'