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

Re: Ignore Ancestry when merging from Progress Dialog?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 12 Jan 2015 19:25:10 +0100

On 12.01.2015 14:30, Marko Mocnik wrote:
> Hi,
> In version 1.8.9 Issue #672 has been fixed, so that a merge from the
> Progress dialog now records the merge info.
> Unfortunately we do not use merginfo at all (to reasons which are
> unkown to me) and usually check 'Ignore ancestry' when merging with
> the merge wizard.
> Is there a way to ignore the ancestry when merging from progress
> dialog? (other than downgrading tortoise? ;)

Even if you don't use the merge info, it won't hurt if it's there.
One day you might want to use it, and if you remove the merge info now
you'll run into troubles then.

That said: no, you can not ignore the merge info when merging from the
progress dialog.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest interface to (Sub)version control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-12 19:25:13 CET

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.