Applying patches to foreign repositories

Sean E. Russell hg at ser1.net
Tue Apr 8 22:35:44 CDT 2008


Sorry... I sent this from the wrong address, so it'll probably get held by the 
mailing list server.  If not, then I apologize for the duplicate.

Hello,

I have what I suspect is not an unusual situation.  I maintain a library for a 
project, and my source code exists in both a master repository (mine, HG) and 
the project's repository (Subversion).  The directory layout looks like this:

	Subversion:	project/lib/mylib/
	Mercurial:	myproject/src/mylib/

The 'project' directory contains a bunch of other directories and files I'm 
not very interested in, and the same goes for 'myproject' and the other 
repository.  The intersection of common code is at the 'mylib' directory.

I'm seeking suggestions for how to manage this -- pushing and pulling diffs to 
and from project/lib/mylib.  I had thought about using a forest, but at this 
point I already have several years worth of history in 'myproject' (converted 
from Subversion), and I'm not sure how I'd best break that up.   The other 
idea I had was 'hg pull --force', but I'm not sure how that's going to work 
with the different directory structure.

Please feel free to point me at existing information, FAQs, or other 
discussions about this if such exists.  My rudimentary queries of the mailing 
list didn't turn up much ... I'm drawing a blank on good search terms to 
filter the archives on.  Of course, any direct responses are also greatly 
appreciated.

Thank you.

-- 
 |..   ------------------------ Sean Russell -------------------------
<|>                     Deutsch  Esperanto  Francaise
/|\    ---------- [    jabber: seanerussell at gmail.com    ] -----------
/|                [       web: http://www.ser1.net       ]



More information about the Mercurial mailing list