bring two repositories back together

[Kevin Bullock]

(cc'ing back to the list, please keep discussion on-list)

On 16 May 2011, at 11:08 AM, John Stean wrote:

> Hello,
> 
> >Have you merged the two branches together in B?
> 
> We pull changes from A into B, so B always is all of A plus its own changes - merging any conflict using B and ignoring A

So you're not just pulling, but pulling -and merging-? In Mercurial, they are separate operations.

> >Do you want the changes from A incorporated into B's branch?
> 
> All I want is to end up with one repo again, known as A .
> 
> I tried a dummy run where I renames A's path, pull -u, then rename A back. Seemed to work...


Yup, a repo is self-contained and it doesn't matter to Mercurial what you name it or where you put it. You can pull from any clone into any other (related) clone.

pacem in terris / mir / shanti / salaam / heiwa
Kevin R. Bullock

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20110516/aedeb0e8/attachment.html>