[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

1.8, Ignore Ancestry in Merge Range does not work

From: Greg Creager <greg.creager_at_hp.com>
Date: Wed, 18 Sep 2013 14:22:21 -0700 (PDT)

I have files that did not get merged due to a tree-conflict so I am going back and remerging them.

I have to 'ingnore' ancestry in order for it to 'redo' the merge.

I selected this option and got an error message saying ignore ancestry cannot be used with an automatic merge.

Is the only option merge two different tree's now? I used to be able to use this option on the normal merge.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-18 23:22:26 CEST

This message: [ Message body ]
Next message: Sergey Azarkevich: "Re: Requests"
Previous message: Greg Creager: "SVN 1.8, Confused by tree conflict Edit Conflicts output"
Next in thread: Stefan Küng: "Re: 1.8, Ignore Ancestry in Merge Range does not work"
Reply: Stefan Küng: "Re: 1.8, Ignore Ancestry in Merge Range does not work"
Reply: Greg Creager: "RE: 1.8, Ignore Ancestry in Merge Range does not work"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.