Add earlier history retroactively?

Nikolaus Rath Nikolaus at rath.org
Thu Apr 8 13:38:10 CDT 2010


Pierre-Yves David <pierre-yves.david at logilab.fr> writes:
> On Thu, Apr 08, 2010 at 06:26:06PM +0300, Predrag Minic wrote:
>> You can convert a subversion repository, then pull (with -f) that one  
>> into your existing repository, and then rebase the existing changes  
>> (with --config ui.merge=internal:other) on top of the pulled svn repo.
>
> But it will alter the whole history of your repo (rebased changeset will be
> "new changeset"). I would use convert, pull -f followed by a dummy merge.

What do you mean by a "dummy merge"? Just reverting all the incoming
changes? 

Am I right that in this case I would end up with a repository that has
two independent "tails" and one head? Is that not going to cause
problems?


Best,

   -Nikolaus

-- 
 »Time flies like an arrow, fruit flies like a Banana.«

  PGP fingerprint: 5B93 61F8 4EA2 E279 ABF6  02CF A9AD B7F8 AE4E 425C



More information about the Mercurial mailing list