HI!
Any further advice on this? The working copy was up-to-date before the merge
(no changes from me). After the merge, "updated" files are of course
different from the working base and so show a "!" in Windows Explorer. So,
it would be nice to see the diff by double-click on the updated files in the
after-merge-dialog.
Thanks!
Thomas
Thomas
"Thomas Börkel" <tbo@ap-ag.com> wrote in message
news:06F51FF9081A1849853B30E42792FCE6020597@ka-srv-015.ap-ag.com...
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 Thu Nov 18 09:28:22 2004