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

RE: [TSVN] Handling after a merge

From: Thomas Börkel <tbo_at_ap-ag.com>
Date: 2004-11-03 10:32:24 CET

HI!

> On Wed, 3 Nov 2004 09:51:24 +0100, Thomas Börkel
> <tbo@ap-ag.com> wrote:
> > > > If I want to see, what the merge has changed on the
> non-conflicted
> > > > files (diff), I also have to go to the Windows Explorer.
> > > >
> > > > I'd like to suggest the following productivity
> enhancements for the
> > > > after-merge-dialog:
> > > >
> > > > 1. Double-click on a non-conflicted ("updated") file
> should show the
> > > > visual diff.
> > >
> > > Not possible! "Updated" means that both the file in your
> working copy
> > > _and_ the file in your working copy base changed
> identically. There's
> > > nothing to diff there.
> >
> > I see. But then TSVN 1.1.1 shows the wrong status in that
> dialog. I *think*, I saw also the status "merged" in 1.1.0
> for some files there.
>
> "merged" is not "updated". When a file gets merged, then it has
> modifications against the working copy base. But these are _your_
> modifications to the file before the update, not the ones merged in
> from the repository.

OK. Still, most of those "updated" files show a "!" in Windows Explorer and can be diffed there against the working base. Why not from the after-merge-dialog?

Thomas

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Nov 3 10:33:03 2004

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