eli.iser_at_gmail.com wrote:
> I'm running SVN 1.53 with Tortoise 1.54.
>
> My company is in the process of migrating from VSS to SVN, and I have
> a particular problem on my hands.
>
> Currently I am experimenting with various migration tools to make
> them work on our bloated and twisted VSS data-base. Advances have
> been made, but I'm not there just yet.
>
> The problem is that I need to migrate a specific project *now*, even
> at the cost of not migrating it's history yet. So I tried to get the
> latest version and commit it to a branch in the SVN. Now the
> project's developers can work on this branch, until I'm ready to
> migrate the rest of the history. So after several changes to the
> branch, I add the history of the project to the trunk. Now I want to
> merge them, so that the changes done to the branch will now sit in
> the trunk, whilst preserving all history.
>
> I've tried all the different merging options: * Reintegrate a branch
> errors out, saying that I must have a common ancestor to work. *
> Merging two different trees (branch:start revision, branch:head,
> trunk:head) replaces the files in the trunk, leaving me with the
> history of the branch only. * Merging different revisions of the same
> tree (branch:start revision, branch:head) updated the trunk properly,
> but doesn't move over the changes history, only the changes in the
> files. The log shows only the merge, not the history.
>
> So, is there a way to accomplish this merge? Can I force the SVN to
> recognize the common ancestry?
>
> Thanks in advance, Eli
Last page in the merge dialog wizard, check "ignore ancestry".
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=981558
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-09 10:22:56 CET