Why temp files when diffing working copy?

[Stefan Haller <ha...@ableton.com>]

When I do a diff of my local modifications against base (or head, or any
other repository revision for that matter), subversion makes a copy of
my modified file in .svn/tmp and uses that for the diff.

Why does it do that?  I find this very inconvenient.  With CVS, I am
used to editing my modified files right in the graphical diff program
(for example to fix simple spelling errors in comments, or to revert one
of the diff chunks while keeping the others).  I do this all the time,
and it's very annoying not to be able to do it in subversion.


-- 
Stefan Haller
Ableton
http://www.ableton.com/

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Why temp files when diffing working copy?

[Ben Collins-Sussman <su...@collab.net>]

On Thu, 2004-07-29 at 14:57, Ed MacDonald wrote:
> I too like to edit in my diff editor.  Without know the internals, it seems
> to make sense that if the product of the diff is intended for the developer,
> then any translation should be to the developers environment.  Is there an
> advantage to de-translating the working copy as opposed to translating the
> repo file for the compare?

Hm, I think we did it this way for a couple of reasons: 

* if we translated the repos (or text-base) file, then 'diff' would
always show changed keywords, which is a bit annoying.

* 'diff' doesn't always involve a working copy;  it would be
inconsistent for 'svn diff URL1 URL2' to show something different than
'svn checkout URL1 wc;  svn diff --old=wc --new=URL2'.




---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Why temp files when diffing working copy?

[Ed MacDonald <ed...@hotmail.com>]

I too like to edit in my diff editor.  Without know the internals, it seems
to make sense that if the product of the diff is intended for the developer,
then any translation should be to the developers environment.  Is there an
advantage to de-translating the working copy as opposed to translating the
repo file for the compare?

Tks.



> On Thu, 2004-07-29 at 12:23, Stefan Haller wrote:
> > When I do a diff of my local modifications against base (or head, or any
> > other repository revision for that matter), subversion makes a copy of
> > my modified file in .svn/tmp and uses that for the diff.
>
> That's because your working file needs to be 'detranslated' in order to
> be compared to the .svn/text-base/ or repository file.
>
> By 'detranslated', I mean:  keywords removed (from $Rev: 27$ to $Rev$)
> and eol-style converted to LF.  This is the way all files are stored in
> the repository whenver svn:eol-style or svn:keywords are being used.
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Why temp files when diffing working copy?

[Ben Collins-Sussman <su...@collab.net>]

On Thu, 2004-07-29 at 12:23, Stefan Haller wrote:
> When I do a diff of my local modifications against base (or head, or any
> other repository revision for that matter), subversion makes a copy of
> my modified file in .svn/tmp and uses that for the diff.

That's because your working file needs to be 'detranslated' in order to
be compared to the .svn/text-base/ or repository file.  

By 'detranslated', I mean:  keywords removed (from $Rev: 27$ to $Rev$)
and eol-style converted to LF.  This is the way all files are stored in
the repository whenver svn:eol-style or svn:keywords are being used.  



---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org