detecting conflicts before actually pulling

Akos Tajti akos.tajti at gmail.com
Mon Jun 20 02:06:24 CDT 2011


Dear List,

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).

Please note that I'd like to solve it the more efficient way. I saw that
bitbucket performs this check for pull requests very fast. Do you have any
idea?

Thanks in advance,
Ákos Tajti
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20110620/54a9afc8/attachment.htm>


More information about the Mercurial-devel mailing list