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

[TSVN] TortoiseMerge Feature Request

From: Peter Hercek <peter_at_syncad.com>
Date: 2007-06-19 10:44:30 CEST


I second this request filed on 6 Apr 2005.
Something like /auto switch would help me too.
Would be fine to use TortoiseMerge even outside of pure TortoiseSvn ussage.
Anyway, if this is not accepted and somebody needs it too then kdiff3 has
such a switch. It just may mean installation of one more program :-/
Would it be hard to add the switch?


Paul Welter wrote:
> Rainer Müller wrote:
> >
> > Paul Welter wrote:
> > > Add a command line option to auto merge the documents when there are no
> > > conflicts. So if /base /theirs /yours and /merged are set and there are
> > > no conflicts, the documents would be automaticly merged and no dialog
> > > would come up. This would all TortoiseMerge to be used in a batch file
> > > to merge documents automaticly if no conflicts.
> >
> > Subversion already merges without a conflict warning if possible AFAIK.
> > You just get a notice about merged files. A conflict is the situation
> > when a programm can't make the right decision what to keep and what to
> > replace.
> I understand that subversion does this. I was talking about using
> TortoiseMerge outside of subversion as a standalone application. I want to
> be able to do a 3 way merge from my own application using TortoiseMerge.
> TortoiseMerge has all the functionality to be a standalone application.
> Adding that one command line switch is all that i need and it works perfect
> for my situation.

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jun 19 11:41:47 2007

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

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