Re: very small packages - merge into general/miscelleneous or move into core

[Olaf Till]

On Thu, Jan 30, 2014 at 03:21:40PM -0500, John W. Eaton wrote:
> On 01/30/2014 04:48 AM, Olaf Till wrote:
> >On Tue, Jan 28, 2014 at 11:41:34PM +0000, Carnë Draug wrote:
> >><snip>
> >>Is there any way to move a file between two
> >>different hg repositories, while keeping its history?
> >
> >Although my knowledge of Mercurial is not comprehensive, I'd think
> >that moving a history of commits between different repositories is not
> >possible, due to the concept. Think of file name clashes, e.g., or
> >even contradictions in the motivation of patches (e.g. if a function
> >was added although an equivalent function was already present in the
> >other repository).
> 
> Nothing prevents merging unrelated repositories:
> 
>   http://mercurial.selenic.com/wiki/MergingUnrelatedRepositories
> 
> Although that page says it is not recommended, it could make perfect
> sense if you are merging two completely separate things to form a
> new combined work.
> 
> In any case, why should merging history be prevented just because
> some conflicts might arise?  With independent development going on,
> conflicts can happen at any time, even for changes that begin with a
> common ancestor.
> 
> However, moving a single file and only the changes for that one file
> is a bit harder since changesets may affect more than one file.  So
> you might have to dig out the series of individual diffs for a
> particular file and apply them one at a time, creating a new series
> of changesets in the process.

I'll give it a try and discuss the result before pushing.

Olaf

-- 
public key id EAFE0591, e.g. on x-hkp://pool.sks-keyservers.net

signature.asc
Description: Digital signature