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

[TSVN] Re: Resolve conflict request feature

From: Jens Scheidtmann <Jens.Scheidtmann_at_bayerbbs.com>
Date: 2005-01-13 09:56:54 CET

SteveKing <steveking@gmx.ch> writes:

> Will Dean wrote:
> > At 19:29 12/01/2005 +0100, you wrote:
> >
> >> I would prefer a toolbar button "Mark as resolved". This would be much
> >> better than resolve on save.
> About the why: resolve on save resolves _every_ time you save a file,
> even if you maybe don't want that file marked as resolved yet. A button
> would allow you to resolve only those files you really want to be marked
> as resolved.

If you start TMerge and supply three files to perform a merge (outside
of Subversion), "resolve on save" tries to issue svn commands anyway
(though there is no conflict associated with the file).

(Yesterday I had to merge changes on a branch back to a file outside
of subversion, because this file was binary at branch time but was
later converted to text on both branches. And as the file has a size
of 10M the tsvn merge --dry-run operation got stuck).

> >> That wouldn't be much work to integrate, would it?
> >
> >
> > No, I don't expect it will take you long at all ;-)
> I'm already on it...



To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 13 09:57:56 2005

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