On Thu, 6 Jan 2005 08:24:39 +0100, George Wieggers
<george.wieggers@gmail.com> wrote:
> > It's suppressed for a reason: a 'diff' on a working copy file always
> > means comparing the working copy file with its base. And since added
> > files don't have a base yet, this won't work at all.
>
> This isn't true, I'm afraid. In this case, after the commit, foo.txt
> has a base. As soon as you do a "svn cp foo.txt bar.txt", the
> text-base of foo.txt also becomes the text-base of bar.txt in the .svn
> area.
_after_ the commit, it has a base, yes. But not before! And after a
commit, you only have moved/copied the file and not added new. That's
a little bit different.
> > > The patch at the bottom of this message enables the diff command for
> > > added files.
> > > I've built and tested this patch and it works as expected.
> >
> > You've tested that? I don't think so.
>
> Before I created the patch, I used the latest version of tortoise and
> tried this command
>
> tortoiseproc /command:diff /path:"f:\test_wc\bar.txt"
>
> Please give it a try, and you'll see that toirtoise is already able to do this.
With TortoiseMerge as the default diff program, you're right it will
work. But I know of no other visual diff program this would work...
That means that if we activate this, people will start reporting bugs
in TSVN because their diff program 'isn't started correctly by TSVN'.
What do you think: should we activate it anyway?
(also keep in mind: the diff isn't just started from the context menu.
There are many other places like the commit dialog where the diff is
started too, and where it is deactivated for added files right now
too).
> > You're patch only activates the context menu 'diff' for added files)
> > too. But I'm sure you haven't tested the actual diff command. It won't
> > work! Because, as I mentioned above: added files don't have a base
> > yet, so there's nothing to compare them with.
>
> Again, I can assure you that I've built and tested this patch. To
> prove my point: following the instructions in build.txt, I was able to
> build the installer. However, build.txt doesn't specify which version
> of the wix tools you need to install. The latest version (2.0.2419)
> fails to generate an installer. Version 2.0.2110 works though. Maybe
> worth mentioning in build.txt? ;-)
WiX starts to annoy me really. Every few weeks a new version which
isn't compatible with the previous one. I have to change the installer
script more because of changes in WiX than I have to change it for
TSVN reasons.
This time the RadioButton element changed.
The script is fixed in revision 2339.
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
Received on Thu Jan 6 08:56:56 2005