Re: Merging branch to trunk without common ancestry

On Dec 9, 11:04 am, Stefan Kueng <tortoise..._at_gmail.com> wrote:
>
> Last page in the merge dialog wizard, check "ignore ancestry".
>
> Stefan
>

Actually I want to preserve the history as if I had a common ancestor.

Regardless, I solved my problem. I ran a test of how a proper merging
of a branch would look like on the history, as saw that it too doesn't
display the history of the merged branch!
Apparently a checkbox "Show merged changes" alluded my eyes. Now I can
see the history of the merged branch, even if they don't have a common
ancestor.

The option to merge different revisions of the same tree worked out
well (without checking the "ignore ancestry" checkbox), and checking
"Show merged changes" shows me the branch's history, like I needed.

Thanks anyway,

Eli

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=981598

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-09 12:04:57 CET