Re: [TSVN] Handling after a merge

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.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org