Detecting conflicts that a pull would cause wothout actually pulling

[till plewe]

>
>> I'd like to solve the following problem:
>> I have a repository (call it A) and a clone of it (call it B). I made some
>> changes in B and I want to ask the owner of A to pull it. I'd like to
>> implement a function that can figure out if the changes in B can be pulled
>> to A without causing any conflicts. I want to implement this in such a way
>> that doesn't corrupt the information in A (so anyone who clones A sees
>> exactly the same than before this confict detection).
>>
>>
> Is "hg incoming" or if you want to avoid multiple downloads "hg incoming
> --bundle" insufficient?
>
>
but how does hg incoming tell me the conflicts? it just lists the changesets
> that would be pulled but doesn't try the merge.
>

Clones are cheap. So how about

    hg clone a b ; cd b; hg fetch ...

if there are problems (you do not want to deal with)

    cd ..; rm -rf b

else use b as your new repository or move everything to a.

- Till
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20110618/95611b04/attachment.htm>