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

[TSVN] Re: TortoiseMerge bug & feature request

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-09-06 09:46:38 CEST

"Jens Scheidtmann" writes:
> > > And if you try to commit such a file, Subversion will throw an error
too.
> >
> > ... yes it does, and it then tells me where the conflicting file is, so
> > everything works perfectly safely.
>
> Does it complain, even if you removed one file from the
> selection in the commit dialog?

If you try to commit anything while there is still a conflict you get a
warning. If there is nothing to commit (or you deselect everything that
needs committing), then there is no warning. The commit status just comes up
empty and says 'Finished'. So it still works safely.

BUT (Stefan) the title of the commit progress dialog is then.
    "SVN Commit... Finished! Finished!"
I don't recall seeing the double wording before. Maybe it's a photo finish
;-) Using build 1618 (still!)

My only (minor) gripe is that once you have done the update which finds the
conflict, there is no way to tell that you still have one until you try to
commit something.

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Sep 11 20:13:42 2004

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