[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mercurial
Subject:    Re: Detecting conflicts that a pull would cause wothout actually
From:       till plewe <till.plewe () gmail ! com>
Date:       2011-06-17 16:37:45
Message-ID: BANLkTikmr1YkyYZo6YLDKo1cr8rT1sqS1w () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


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

[Attachment #5 (text/html)]

<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 \
.8ex;border-left:1px #ccc solid;padding-left:1ex;"><div bgcolor="#FFFFFF"><div><div \
class="h5"><blockquote type="cite"><div><div class="gmail_quote"> <blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div><br></div><div>I&#39;d like to solve the following \
problem:</div><div>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&#39;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&#39;t corrupt the information in A (so anyone who clones A sees exactly the \
same than before this confict detection).</div>


<div><br></div></blockquote><div><br>Is &quot;hg incoming&quot; or if you want to \
avoid multiple downloads &quot;hg incoming --bundle&quot; \
insufficient?<br></div></div> \
</div></blockquote></div></div></div></blockquote></div><br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex;"><div bgcolor="#FFFFFF"><div>but how does hg incoming tell me \
the conflicts? it just lists the changesets that would be pulled but doesn&#39;t try \
the merge.</div> </div></blockquote><div><br>Clones are cheap. So how about <br><br>  \
hg clone a b ; cd b; hg fetch ...<br><br>if there are problems (you do not want to \
deal with)<br><br>       cd ..; rm -rf b<br><br>else use b as your new repository or \
move everything to a.      <br> <br>- Till<br></div>



_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial


[prev in list] [next in list] [prev in thread] [next in thread]