You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Steven Woody <na...@gmail.com> on 2008/12/05 13:08:39 UTC
Edit working copy while see the 'diff'
Hi,
My svn diff-cmd was set to use 'vim -d', it's great. But I found
subversion is creating troubles for me when I in the 'vim -d' window,
checking the differences and want to do a little modification to my
working copy. You know, the $7 parameter the 'svn diff' command
provided is actually a temporary file, which is a copy of my working
copy not the real one. so in my 'vim -d''s right window, I can only
edit/modify the fake copy.
Is there a solution to the problem? Thanks in advance.
-
narke
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980080
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: German Umlaute on MAc OSX 10.5 Running SVN 1.4.3 client
Posted by Stefan Sperling <st...@elego.de>.
On Mon, Dec 08, 2008 at 11:32:08PM +0000, Stefan Sperling wrote:
> On Sat, Dec 06, 2008 at 10:45:57AM +0100, Dieter Oberkofler wrote:
> > Hi,
> > I having problems when updating a working copy on a Mac OSX 10.5 client
> > using svn 1.4.3 (r23084) client running against a repository on a Windows
> > 2003 Server running 1.4.3. When using filenames that contain "German
> > Umlaute" (but I guess it's the same for any other non ASCII7 encoding) I get
> > the following type of error:
> > ---
> > Apples-Power-Mac-G5:/MyDev/ljs_app/trunk apple$ svn update
> > svn: Can't convert string from 'UTF-8' to native encoding:
> > svn: examples/ptk_example/mac/test/o?\204?\136a?\204?\136u?\204?\136
> > ---
> > Can anyone help?
>
> This is a known issue.
> See http://subversion.tigris.org/issues/show_bug.cgi?id=2464
>
> For a technical description of the problem, and explanation why
> it is not easy to solve, see:
> http://svn.collab.net/repos/svn/trunk/notes/unicode-composition-for-filenames
And see also here for a human-readable description of the problem:
http://www.zennaware.com/cornerstone/faq.php#accents
Stefan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=981378
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: German Umlaute on MAc OSX 10.5 Running SVN 1.4.3 client
Posted by Stefan Sperling <st...@elego.de>.
On Mon, Dec 08, 2008 at 11:32:08PM +0000, Stefan Sperling wrote:
> On Sat, Dec 06, 2008 at 10:45:57AM +0100, Dieter Oberkofler wrote:
> > Hi,
> > I having problems when updating a working copy on a Mac OSX 10.5 client
> > using svn 1.4.3 (r23084) client running against a repository on a Windows
> > 2003 Server running 1.4.3. When using filenames that contain "German
> > Umlaute" (but I guess it's the same for any other non ASCII7 encoding) I get
> > the following type of error:
> > ---
> > Apples-Power-Mac-G5:/MyDev/ljs_app/trunk apple$ svn update
> > svn: Can't convert string from 'UTF-8' to native encoding:
> > svn: examples/ptk_example/mac/test/o?\204?\136a?\204?\136u?\204?\136
> > ---
> > Can anyone help?
>
> This is a known issue.
> See http://subversion.tigris.org/issues/show_bug.cgi?id=2464
>
> For a technical description of the problem, and explanation why
> it is not easy to solve, see:
> http://svn.collab.net/repos/svn/trunk/notes/unicode-composition-for-filenames
And see also here for a human-readable description of the problem:
http://www.zennaware.com/cornerstone/faq.php#accents
Stefan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=981378
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=982396
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: German Umlaute on MAc OSX 10.5 Running SVN 1.4.3 client
Posted by Stefan Sperling <st...@elego.de>.
On Mon, Dec 08, 2008 at 09:49:07PM -0600, Ryan Schmidt wrote:
> On Dec 8, 2008, at 17:32, Stefan Sperling wrote:
>
> > On Sat, Dec 06, 2008 at 10:45:57AM +0100, Dieter Oberkofler wrote:
> >>
> >
> >> I having problems when updating a working copy on a Mac OSX 10.5
> >> client
> >> using svn 1.4.3 (r23084) client running against a repository on a
> >> Windows
> >> 2003 Server running 1.4.3. When using filenames that contain "German
> >> Umlaute" (but I guess it's the same for any other non ASCII7
> >> encoding) I get
> >> the following type of error:
> >> ---
> >> Apples-Power-Mac-G5:/MyDev/ljs_app/trunk apple$ svn update
> >> svn: Can't convert string from 'UTF-8' to native encoding:
> >> svn: examples/ptk_example/mac/test/o?\204?\136a?\204?\136u?\204?\136
> >> ---
> >> Can anyone help?
> >
> > This is a known issue.
> > See http://subversion.tigris.org/issues/show_bug.cgi?id=2464
> >
> > For a technical description of the problem, and explanation why
> > it is not easy to solve, see:
> > http://svn.collab.net/repos/svn/trunk/notes/unicode-composition-for-
> > filenames
>
> Stefan, I agree that is a known issue with non-ASCII filenames when
> in a mixed Mac/Windows environment. However, that's not the error
> message Dieter reported.
Oops :)
Sorry, my faq trigger fired in the wrong direction.
Stefan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=981603
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: German Umlaute on MAc OSX 10.5 Running SVN 1.4.3 client
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Dec 8, 2008, at 23:57, Dieter Oberkofler wrote:
> Ryan Schmidt wrote:
>
>>> On Sat, Dec 06, 2008 at 10:45:57AM +0100, Dieter Oberkofler wrote:
>>>
>>>> I having problems when updating a working copy on a Mac OSX 10.5
>>>> client using svn 1.4.3 (r23084) client running against a repository
>>>> on a Windows
>>>> 2003 Server running 1.4.3. When using filenames that contain
>>>> "German
>>>> Umlaute" (but I guess it's the same for any other non ASCII7
>>>> encoding) I get
>>>> the following type of error:
>>>> ---
>>>> Apples-Power-Mac-G5:/MyDev/ljs_app/trunk apple$ svn update
>>>> svn: Can't convert string from 'UTF-8' to native encoding:
>>>> svn: examples/ptk_example/mac/test/o?\204?\136a?\204?\136u?\204?
>>>> \136
[snip]
>> the "Can't convert string from 'UTF-8' to native encoding"
>> message usually indicates that the LANG environment variable has
>> not been
>> set to a reasonable value for the system in question.
>
> What would be a "reasonable" value for the LANG environment variable?
> (UTF-8)
It depends what locales are defined on the client operating system.
On Mac OS X 10.4 I use "en_US.UTF-8". Or if I wanted to see German
messages, I would use "de_DE.UTF-8". I don't know if the names have
changed between Mac OS X 10.4 and 10.5, but the list of valid locales
is the names of the directories in /usr/share/locale on your system.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=981498
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: German Umlaute on MAc OSX 10.5 Running SVN 1.4.3 client
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Dec 8, 2008, at 23:57, Dieter Oberkofler wrote:
> Ryan Schmidt wrote:
>
>>> On Sat, Dec 06, 2008 at 10:45:57AM +0100, Dieter Oberkofler wrote:
>>>
>>>> I having problems when updating a working copy on a Mac OSX 10.5
>>>> client using svn 1.4.3 (r23084) client running against a repository
>>>> on a Windows
>>>> 2003 Server running 1.4.3. When using filenames that contain
>>>> "German
>>>> Umlaute" (but I guess it's the same for any other non ASCII7
>>>> encoding) I get
>>>> the following type of error:
>>>> ---
>>>> Apples-Power-Mac-G5:/MyDev/ljs_app/trunk apple$ svn update
>>>> svn: Can't convert string from 'UTF-8' to native encoding:
>>>> svn: examples/ptk_example/mac/test/o?\204?\136a?\204?\136u?\204?
>>>> \136
[snip]
>> the "Can't convert string from 'UTF-8' to native encoding"
>> message usually indicates that the LANG environment variable has
>> not been
>> set to a reasonable value for the system in question.
>
> What would be a "reasonable" value for the LANG environment variable?
> (UTF-8)
It depends what locales are defined on the client operating system.
On Mac OS X 10.4 I use "en_US.UTF-8". Or if I wanted to see German
messages, I would use "de_DE.UTF-8". I don't know if the names have
changed between Mac OS X 10.4 and 10.5, but the list of valid locales
is the names of the directories in /usr/share/locale on your system.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=981498
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=982458
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: German Umlaute on MAc OSX 10.5 Running SVN 1.4.3 client
Posted by Dieter Oberkofler <do...@gmail.com>.
What would be a "reasonable" value for the LANG environment variable?
(UTF-8)
Thank you,
Dieter
-----Original Message-----
From: Ryan Schmidt [mailto:subversion-2008c@ryandesign.com]
Sent: Tuesday, December 09, 2008 04:49
To: Stefan Sperling
Cc: Dieter Oberkofler; users@subversion.tigris.org
Subject: Re: German Umlaute on MAc OSX 10.5 Running SVN 1.4.3 client
On Dec 8, 2008, at 17:32, Stefan Sperling wrote:
> On Sat, Dec 06, 2008 at 10:45:57AM +0100, Dieter Oberkofler wrote:
>>
>
>> I having problems when updating a working copy on a Mac OSX 10.5
>> client using svn 1.4.3 (r23084) client running against a repository
>> on a Windows
>> 2003 Server running 1.4.3. When using filenames that contain "German
>> Umlaute" (but I guess it's the same for any other non ASCII7
>> encoding) I get
>> the following type of error:
>> ---
>> Apples-Power-Mac-G5:/MyDev/ljs_app/trunk apple$ svn update
>> svn: Can't convert string from 'UTF-8' to native encoding:
>> svn: examples/ptk_example/mac/test/o?\204?\136a?\204?\136u?\204?\136
>> ---
>> Can anyone help?
>
> This is a known issue.
> See http://subversion.tigris.org/issues/show_bug.cgi?id=2464
>
> For a technical description of the problem, and explanation why it is
> not easy to solve, see:
> http://svn.collab.net/repos/svn/trunk/notes/unicode-composition-for-
> filenames
Stefan, I agree that is a known issue with non-ASCII filenames when in a
mixed Mac/Windows environment. However, that's not the error message Dieter
reported. Rather, the "Can't convert string from 'UTF-8' to native encoding"
message usually indicates that the LANG environment variable has not been
set to a reasonable value for the system in question.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=981492
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: German Umlaute on MAc OSX 10.5 Running SVN 1.4.3 client
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Dec 8, 2008, at 17:32, Stefan Sperling wrote:
> On Sat, Dec 06, 2008 at 10:45:57AM +0100, Dieter Oberkofler wrote:
>>
>
>> I having problems when updating a working copy on a Mac OSX 10.5
>> client
>> using svn 1.4.3 (r23084) client running against a repository on a
>> Windows
>> 2003 Server running 1.4.3. When using filenames that contain "German
>> Umlaute" (but I guess it's the same for any other non ASCII7
>> encoding) I get
>> the following type of error:
>> ---
>> Apples-Power-Mac-G5:/MyDev/ljs_app/trunk apple$ svn update
>> svn: Can't convert string from 'UTF-8' to native encoding:
>> svn: examples/ptk_example/mac/test/o?\204?\136a?\204?\136u?\204?\136
>> ---
>> Can anyone help?
>
> This is a known issue.
> See http://subversion.tigris.org/issues/show_bug.cgi?id=2464
>
> For a technical description of the problem, and explanation why
> it is not easy to solve, see:
> http://svn.collab.net/repos/svn/trunk/notes/unicode-composition-for-
> filenames
Stefan, I agree that is a known issue with non-ASCII filenames when
in a mixed Mac/Windows environment. However, that's not the error
message Dieter reported. Rather, the "Can't convert string from
'UTF-8' to native encoding" message usually indicates that the LANG
environment variable has not been set to a reasonable value for the
system in question.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=981459
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: German Umlaute on MAc OSX 10.5 Running SVN 1.4.3 client
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Dec 8, 2008, at 17:32, Stefan Sperling wrote:
> On Sat, Dec 06, 2008 at 10:45:57AM +0100, Dieter Oberkofler wrote:
>>
>
>> I having problems when updating a working copy on a Mac OSX 10.5
>> client
>> using svn 1.4.3 (r23084) client running against a repository on a
>> Windows
>> 2003 Server running 1.4.3. When using filenames that contain "German
>> Umlaute" (but I guess it's the same for any other non ASCII7
>> encoding) I get
>> the following type of error:
>> ---
>> Apples-Power-Mac-G5:/MyDev/ljs_app/trunk apple$ svn update
>> svn: Can't convert string from 'UTF-8' to native encoding:
>> svn: examples/ptk_example/mac/test/o?\204?\136a?\204?\136u?\204?\136
>> ---
>> Can anyone help?
>
> This is a known issue.
> See http://subversion.tigris.org/issues/show_bug.cgi?id=2464
>
> For a technical description of the problem, and explanation why
> it is not easy to solve, see:
> http://svn.collab.net/repos/svn/trunk/notes/unicode-composition-for-
> filenames
Stefan, I agree that is a known issue with non-ASCII filenames when
in a mixed Mac/Windows environment. However, that's not the error
message Dieter reported. Rather, the "Can't convert string from
'UTF-8' to native encoding" message usually indicates that the LANG
environment variable has not been set to a reasonable value for the
system in question.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=981459
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=982419
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: German Umlaute on MAc OSX 10.5 Running SVN 1.4.3 client
Posted by Stefan Sperling <st...@elego.de>.
On Sat, Dec 06, 2008 at 10:45:57AM +0100, Dieter Oberkofler wrote:
> Hi,
> I having problems when updating a working copy on a Mac OSX 10.5 client
> using svn 1.4.3 (r23084) client running against a repository on a Windows
> 2003 Server running 1.4.3. When using filenames that contain "German
> Umlaute" (but I guess it's the same for any other non ASCII7 encoding) I get
> the following type of error:
> ---
> Apples-Power-Mac-G5:/MyDev/ljs_app/trunk apple$ svn update
> svn: Can't convert string from 'UTF-8' to native encoding:
> svn: examples/ptk_example/mac/test/o?\204?\136a?\204?\136u?\204?\136
> ---
> Can anyone help?
This is a known issue.
See http://subversion.tigris.org/issues/show_bug.cgi?id=2464
For a technical description of the problem, and explanation why
it is not easy to solve, see:
http://svn.collab.net/repos/svn/trunk/notes/unicode-composition-for-filenames
Stefan
PS: Please do not reply to an existing thread on this list
with an unrelated topic. It screws up sorting of messages
in many peoples' mailboxes and, more importantly, the mailing
list archives, because the In-Reply-To mail header will be wrong.
Just send a new message to the list when starting a new topic,
not a reply to some other random email. Thanks.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=981372
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: German Umlaute on MAc OSX 10.5 Running SVN 1.4.3 client
Posted by Stefan Sperling <st...@elego.de>.
On Sat, Dec 06, 2008 at 10:45:57AM +0100, Dieter Oberkofler wrote:
> Hi,
> I having problems when updating a working copy on a Mac OSX 10.5 client
> using svn 1.4.3 (r23084) client running against a repository on a Windows
> 2003 Server running 1.4.3. When using filenames that contain "German
> Umlaute" (but I guess it's the same for any other non ASCII7 encoding) I get
> the following type of error:
> ---
> Apples-Power-Mac-G5:/MyDev/ljs_app/trunk apple$ svn update
> svn: Can't convert string from 'UTF-8' to native encoding:
> svn: examples/ptk_example/mac/test/o?\204?\136a?\204?\136u?\204?\136
> ---
> Can anyone help?
This is a known issue.
See http://subversion.tigris.org/issues/show_bug.cgi?id=2464
For a technical description of the problem, and explanation why
it is not easy to solve, see:
http://svn.collab.net/repos/svn/trunk/notes/unicode-composition-for-filenames
Stefan
PS: Please do not reply to an existing thread on this list
with an unrelated topic. It screws up sorting of messages
in many peoples' mailboxes and, more importantly, the mailing
list archives, because the In-Reply-To mail header will be wrong.
Just send a new message to the list when starting a new topic,
not a reply to some other random email. Thanks.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=981372
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=982409
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
German Umlaute on MAc OSX 10.5 Running SVN 1.4.3 client
Posted by Dieter Oberkofler <do...@gmail.com>.
Hi,
I having problems when updating a working copy on a Mac OSX 10.5 client
using svn 1.4.3 (r23084) client running against a repository on a Windows
2003 Server running 1.4.3. When using filenames that contain "German
Umlaute" (but I guess it's the same for any other non ASCII7 encoding) I get
the following type of error:
---
Apples-Power-Mac-G5:/MyDev/ljs_app/trunk apple$ svn update
svn: Can't convert string from 'UTF-8' to native encoding:
svn: examples/ptk_example/mac/test/o?\204?\136a?\204?\136u?\204?\136
---
Can anyone help?
Thank you,
Dieter
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980488
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Edit working copy while see the 'diff'
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Steven Woody wrote on Tue, 9 Dec 2008 at 15:37 +0800:
> On Sun, Dec 7, 2008 at 3:49 AM, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> > You should be able to build something around :diffpatch, e.g.
> >
> > :!svn diff % > tmpfile
> > :diffpatch tmpfile
> >
>
> I am not quite understand. When I am in a svn created tmp file, then
> the '%' should be the tmp file. How your ':!svn diff %' can work?
The tmp file never gets in the picture. I would run those commands when
the file I want to diff the current buffer. In other words, I wouldn't
run 'svn diff main.c'; I would run 'vim main.c' (and then the two commands
I gave above).
Daniel
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=983368
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Edit working copy while see the 'diff'
Posted by Steven Woody <na...@gmail.com>.
On Sun, Dec 7, 2008 at 3:49 AM, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> Steven Woody wrote on Sat, 6 Dec 2008 at 13:44 +0800:
>> On Sat, Dec 6, 2008 at 5:04 AM, Ryan Schmidt
>> <su...@ryandesign.com> wrote:
>> > When you want to look at a diff, you don't want to see a line for each
>> > keyword that got expanded, so Subversion creates a temporary copy of your
>> > working file and unexpands the keywords in it so that it can show a clean
>> > diff against the pristine copy.
>>
>> Ok, thank you. It now sounds reasonable. I am thinking that is there
>> another vim user get similar requirement like me, I still want to
>> directly edit my working copy ... :)
>>
>
> You should be able to build something around :diffpatch, e.g.
>
> :!svn diff % > tmpfile
> :diffpatch tmpfile
>
Hi, Daniel
I am not quite understand. When I am in a svn created tmp file, then
the '%' should be the tmp file. How your ':!svn diff %' can work?
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=981523
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Edit working copy while see the 'diff'
Posted by Steven Woody <na...@gmail.com>.
On Sun, Dec 7, 2008 at 3:49 AM, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> Steven Woody wrote on Sat, 6 Dec 2008 at 13:44 +0800:
>> On Sat, Dec 6, 2008 at 5:04 AM, Ryan Schmidt
>> <su...@ryandesign.com> wrote:
>> > When you want to look at a diff, you don't want to see a line for each
>> > keyword that got expanded, so Subversion creates a temporary copy of your
>> > working file and unexpands the keywords in it so that it can show a clean
>> > diff against the pristine copy.
>>
>> Ok, thank you. It now sounds reasonable. I am thinking that is there
>> another vim user get similar requirement like me, I still want to
>> directly edit my working copy ... :)
>>
>
> You should be able to build something around :diffpatch, e.g.
>
> :!svn diff % > tmpfile
> :diffpatch tmpfile
>
Hi, Daniel
I am not quite understand. When I am in a svn created tmp file, then
the '%' should be the tmp file. How your ':!svn diff %' can work?
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=981523
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=982414
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Edit working copy while see the 'diff'
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Steven Woody wrote on Sat, 6 Dec 2008 at 13:44 +0800:
> On Sat, Dec 6, 2008 at 5:04 AM, Ryan Schmidt
> <su...@ryandesign.com> wrote:
> > When you want to look at a diff, you don't want to see a line for each
> > keyword that got expanded, so Subversion creates a temporary copy of your
> > working file and unexpands the keywords in it so that it can show a clean
> > diff against the pristine copy.
>
> Ok, thank you. It now sounds reasonable. I am thinking that is there
> another vim user get similar requirement like me, I still want to
> directly edit my working copy ... :)
>
You should be able to build something around :diffpatch, e.g.
:!svn diff % > tmpfile
:diffpatch tmpfile
However, personally, I keep a window open on the 'svn diff' output (which
I leave as the default unidiff), and wrote a command[1] that refreshes it
(after I've made changes and want to see the new diff).
HTH,
Daniel
[1] the :SvnRediff command, in
http://article.gmane.org/gmane.comp.version-control.subversion.devel/105397
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980450
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980579
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
German Umlaute on Mac OSX 10.5 Running SVN 1.4.3 client
Posted by Dieter Oberkofler <do...@gmail.com>.
Hi,
I having problems when updating a working copy on a Mac OSX 10.5 client
using svn 1.4.3 (r23084) client running against a repository on a Windows
2003 Server running 1.4.3. When using filenames that contain "German
Umlaute" (but I guess it's the same for any other non ASCII7 encoding) I get
the following type of error:
---
Apples-Power-Mac-G5:/MyDev/ljs_app/trunk apple$ svn update
svn: Can't convert string from 'UTF-8' to native encoding:
svn: examples/ptk_example/mac/test/o?\204?\136a?\204?\136u?\204?\136
---
Can anyone help?
Thank you,
Dieter
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=981176
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Edit working copy while see the 'diff'
Posted by Steven Woody <na...@gmail.com>.
On Sat, Dec 6, 2008 at 5:04 AM, Ryan Schmidt
<su...@ryandesign.com> wrote:
> On Dec 5, 2008, at 13:57, Steven Woody wrote:
>
>> On Sat, Dec 6, 2008 at 3:43 AM, Ryan Schmidt wrote:
>>
>>> On Dec 5, 2008, at 13:40, Steven Woody wrote:
>>>
>>>> On Sat, Dec 6, 2008 at 3:06 AM, Ryan Schmidt wrote:
>>>>
>>>>> On Dec 5, 2008, at 12:58, Steven Woody wrote:
>>>>>
>>>>>> Hi, let me make it clear: sometimes 'svn diff' command will generate
>>>>>> a file /tmp/svndiff.tmp as the right hand side file, and passwd the
>>>>>> name of the file to used defined external diff command such as
>>>>>> vimdiff. Could anyone tell me why this happend and how to avoid it.
>>>>>
>>>>> I believe I remember someone saying this happens only when you have
>>>>> used
>>>>> the svn:eol-style property on the file, but I have not tested this.
>>>>
>>>> Yes, the file is a .c source file and I used the "*.c =
>>>> svn:eol-style=native" line in my .subversion/config. but even after I
>>>> commented the config line, the /tmp/svndiff.tmp is still be generated.
>>>
>>> That line in the config file is in the auto-props section. It means the
>>> properties will be automatically added to new files when they're added to
>>> the repository. Now that your file is in the repository, changing that
>>> line
>>> in the config file has no effect for it. If you want to test this, you
>>> will
>>> have to actually remove the svn:eol-style property from the file in
>>> question.
>>
>> Than you. I tested and the result is that the svn:eol-style property
>> has nothing to do with the problem, it is the "svn:keywords" property
>> and set on this file caused the strange behavior. After I removed the
>> "svn:keywords" property, 'svn diff' will give me expected result. But
>> I need my source files have a "svn:keywords" property, so I can add
>> $Id$ in each of these file. I still don't understand why the
>> "svn:keywords" property conflict with "svn diff' behavior. Do you
>> experts get a solution? Thanks in advance.
>
> Oh, yes, I'm sorry, it was svn:keywords, and it makes sense too; here's why:
>
> Subversion stores files in the repository with their keywords unexpanded.
> When you check out a working copy, it copies those files with unexpanded
> keywords into the text-base directory in the .svn directory in your working
> copy. (These are the "pristine" files.) Then it copies those files into the
> working copy and expands the keywords.
>
> When you want to look at a diff, you don't want to see a line for each
> keyword that got expanded, so Subversion creates a temporary copy of your
> working file and unexpands the keywords in it so that it can show a clean
> diff against the pristine copy.
Ok, thank you. It now sounds reasonable. I am thinking that is there
another vim user get similar requirement like me, I still want to
directly edit my working copy ... :)
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980450
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Edit working copy while see the 'diff'
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Dec 5, 2008, at 13:57, Steven Woody wrote:
> On Sat, Dec 6, 2008 at 3:43 AM, Ryan Schmidt wrote:
>
>> On Dec 5, 2008, at 13:40, Steven Woody wrote:
>>
>>> On Sat, Dec 6, 2008 at 3:06 AM, Ryan Schmidt wrote:
>>>
>>>> On Dec 5, 2008, at 12:58, Steven Woody wrote:
>>>>
>>>>> Hi, let me make it clear: sometimes 'svn diff' command will
>>>>> generate
>>>>> a file /tmp/svndiff.tmp as the right hand side file, and passwd
>>>>> the
>>>>> name of the file to used defined external diff command such as
>>>>> vimdiff. Could anyone tell me why this happend and how to
>>>>> avoid it.
>>>>
>>>> I believe I remember someone saying this happens only when you
>>>> have used
>>>> the svn:eol-style property on the file, but I have not tested this.
>>>
>>> Yes, the file is a .c source file and I used the "*.c =
>>> svn:eol-style=native" line in my .subversion/config. but even
>>> after I
>>> commented the config line, the /tmp/svndiff.tmp is still be
>>> generated.
>>
>> That line in the config file is in the auto-props section. It
>> means the
>> properties will be automatically added to new files when they're
>> added to
>> the repository. Now that your file is in the repository, changing
>> that line
>> in the config file has no effect for it. If you want to test this,
>> you will
>> have to actually remove the svn:eol-style property from the file in
>> question.
>
> Than you. I tested and the result is that the svn:eol-style property
> has nothing to do with the problem, it is the "svn:keywords" property
> and set on this file caused the strange behavior. After I removed the
> "svn:keywords" property, 'svn diff' will give me expected result. But
> I need my source files have a "svn:keywords" property, so I can add
> $Id$ in each of these file. I still don't understand why the
> "svn:keywords" property conflict with "svn diff' behavior. Do you
> experts get a solution? Thanks in advance.
Oh, yes, I'm sorry, it was svn:keywords, and it makes sense too;
here's why:
Subversion stores files in the repository with their keywords
unexpanded. When you check out a working copy, it copies those files
with unexpanded keywords into the text-base directory in the .svn
directory in your working copy. (These are the "pristine" files.)
Then it copies those files into the working copy and expands the
keywords.
When you want to look at a diff, you don't want to see a line for
each keyword that got expanded, so Subversion creates a temporary
copy of your working file and unexpands the keywords in it so that it
can show a clean diff against the pristine copy.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980350
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Edit working copy while see the 'diff'
Posted by Steven Woody <na...@gmail.com>.
On Sat, Dec 6, 2008 at 3:43 AM, Ryan Schmidt
<su...@ryandesign.com> wrote:
> On Dec 5, 2008, at 13:40, Steven Woody wrote:
>
>> On Sat, Dec 6, 2008 at 3:06 AM, Ryan Schmidt
>> <su...@ryandesign.com> wrote:
>>>
>>> On Dec 5, 2008, at 12:58, Steven Woody wrote:
>>>
>>>> Hi, let me make it clear: sometimes 'svn diff' command will generate
>>>> a file /tmp/svndiff.tmp as the right hand side file, and passwd the
>>>> name of the file to used defined external diff command such as
>>>> vimdiff. Could anyone tell me why this happend and how to avoid it.
>>>
>>> I believe I remember someone saying this happens only when you have used
>>> the
>>> svn:eol-style property on the file, but I have not tested this.
>>
>> Yes, the file is a .c source file and I used the "*.c =
>> svn:eol-style=native" line in my .subversion/config. but even after I
>> commented the config line, the /tmp/svndiff.tmp is still be generated.
>
> That line in the config file is in the auto-props section. It means the
> properties will be automatically added to new files when they're added to
> the repository. Now that your file is in the repository, changing that line
> in the config file has no effect for it. If you want to test this, you will
> have to actually remove the svn:eol-style property from the file in
> question.
>
>
Than you. I tested and the result is that the svn:eol-style property
has nothing to do with the problem, it is the "svn:keywords" property
and set on this file caused the strange behavior. After I removed the
"svn:keywords" property, 'svn diff' will give me expected result. But
I need my source files have a "svn:keywords" property, so I can add
$Id$ in each of these file. I still don't understand why the
"svn:keywords" property conflict with "svn diff' behavior. Do you
experts get a solution? Thanks in advance.
-
narke
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980311
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Edit working copy while see the 'diff'
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Dec 5, 2008, at 13:40, Steven Woody wrote:
> On Sat, Dec 6, 2008 at 3:06 AM, Ryan Schmidt
> <su...@ryandesign.com> wrote:
>> On Dec 5, 2008, at 12:58, Steven Woody wrote:
>>
>>> Hi, let me make it clear: sometimes 'svn diff' command will
>>> generate
>>> a file /tmp/svndiff.tmp as the right hand side file, and passwd the
>>> name of the file to used defined external diff command such as
>>> vimdiff. Could anyone tell me why this happend and how to avoid
>>> it.
>>
>> I believe I remember someone saying this happens only when you
>> have used the
>> svn:eol-style property on the file, but I have not tested this.
>
> Yes, the file is a .c source file and I used the "*.c =
> svn:eol-style=native" line in my .subversion/config. but even after I
> commented the config line, the /tmp/svndiff.tmp is still be generated.
That line in the config file is in the auto-props section. It means
the properties will be automatically added to new files when they're
added to the repository. Now that your file is in the repository,
changing that line in the config file has no effect for it. If you
want to test this, you will have to actually remove the svn:eol-style
property from the file in question.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980296
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Edit working copy while see the 'diff'
Posted by Steven Woody <na...@gmail.com>.
On Sat, Dec 6, 2008 at 3:06 AM, Ryan Schmidt
<su...@ryandesign.com> wrote:
> On Dec 5, 2008, at 12:58, Steven Woody wrote:
>
>> On Sat, Dec 6, 2008 at 1:42 AM, Steven Woody <na...@gmail.com> wrote:
>>>
>>> On Fri, Dec 5, 2008 at 10:24 PM, David Weintraub <qa...@gmail.com>
>>> wrote:
>>>>
>>>> I also use vimdiff as my diff program when I do a "svn diff" on files,
>>>> and I
>>>> don't seem to have this issue. I can easily edit my current file (which
>>>> appears on the right hand side).
>>>> Here's my "diff" command:
>>>> #! /usr/bin/env perl
>>>> use strict;
>>>> use warnings;
>>>> my $DIFF = "/usr/local/bin/vimdiff";
>>>> my $parameters = $#ARGV;
>>>> my $file1 = $ARGV[$parameters - 1];
>>>> my $file2 = $ARGV[$parameters];
>>>> my $title1 = $ARGV[$parameters - 4];
>>>> my $title2 = $ARGV[$parameters - 2];
>>>> my $title = "$title1 - $title2";
>>>> $title =~ s/\t/ /g;
>>>> $title =~ s/ /\\ /g;
>>>> my $command = qq($DIFF -c "set titlestring=$title" "$file1" "$file2");
>>>> system qq($command);
>>>> The file on the left is a temporary file. The file on the right is the
>>>> actual file being compared.
>>>
>>> my problem is that some times svn will call the external diff command
>>> with $ARGV[$parameters - 1] or $7 in bash with something like
>>> /tmp/svndiff.c, and I don't understand why he can not rather use the
>>> real working copy.
>>
>> Hi, let me make it clear: sometimes 'svn diff' command will generate
>> a file /tmp/svndiff.tmp as the right hand side file, and passwd the
>> name of the file to used defined external diff command such as
>> vimdiff. Could anyone tell me why this happend and how to avoid it.
>
> I believe I remember someone saying this happens only when you have used the
> svn:eol-style property on the file, but I have not tested this.
>
Yes, the file is a .c source file and I used the "*.c =
svn:eol-style=native" line in my .subversion/config. but even after I
commented the config line, the /tmp/svndiff.tmp is still be generated.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980293
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Edit working copy while see the 'diff'
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Dec 5, 2008, at 12:58, Steven Woody wrote:
> On Sat, Dec 6, 2008 at 1:42 AM, Steven Woody <na...@gmail.com>
> wrote:
>> On Fri, Dec 5, 2008 at 10:24 PM, David Weintraub
>> <qa...@gmail.com> wrote:
>>> I also use vimdiff as my diff program when I do a "svn diff" on
>>> files, and I
>>> don't seem to have this issue. I can easily edit my current file
>>> (which
>>> appears on the right hand side).
>>> Here's my "diff" command:
>>> #! /usr/bin/env perl
>>> use strict;
>>> use warnings;
>>> my $DIFF = "/usr/local/bin/vimdiff";
>>> my $parameters = $#ARGV;
>>> my $file1 = $ARGV[$parameters - 1];
>>> my $file2 = $ARGV[$parameters];
>>> my $title1 = $ARGV[$parameters - 4];
>>> my $title2 = $ARGV[$parameters - 2];
>>> my $title = "$title1 - $title2";
>>> $title =~ s/\t/ /g;
>>> $title =~ s/ /\\ /g;
>>> my $command = qq($DIFF -c "set titlestring=$title" "$file1"
>>> "$file2");
>>> system qq($command);
>>> The file on the left is a temporary file. The file on the right
>>> is the
>>> actual file being compared.
>>
>> my problem is that some times svn will call the external diff command
>> with $ARGV[$parameters - 1] or $7 in bash with something like
>> /tmp/svndiff.c, and I don't understand why he can not rather use the
>> real working copy.
>
> Hi, let me make it clear: sometimes 'svn diff' command will generate
> a file /tmp/svndiff.tmp as the right hand side file, and passwd the
> name of the file to used defined external diff command such as
> vimdiff. Could anyone tell me why this happend and how to avoid it.
I believe I remember someone saying this happens only when you have
used the svn:eol-style property on the file, but I have not tested this.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980265
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Edit working copy while see the 'diff'
Posted by Steven Woody <na...@gmail.com>.
On Sat, Dec 6, 2008 at 1:42 AM, Steven Woody <na...@gmail.com> wrote:
> On Fri, Dec 5, 2008 at 10:24 PM, David Weintraub <qa...@gmail.com> wrote:
>> I also use vimdiff as my diff program when I do a "svn diff" on files, and I
>> don't seem to have this issue. I can easily edit my current file (which
>> appears on the right hand side).
>> Here's my "diff" command:
>> #! /usr/bin/env perl
>> use strict;
>> use warnings;
>> my $DIFF = "/usr/local/bin/vimdiff";
>> my $parameters = $#ARGV;
>> my $file1 = $ARGV[$parameters - 1];
>> my $file2 = $ARGV[$parameters];
>> my $title1 = $ARGV[$parameters - 4];
>> my $title2 = $ARGV[$parameters - 2];
>> my $title = "$title1 - $title2";
>> $title =~ s/\t/ /g;
>> $title =~ s/ /\\ /g;
>> my $command = qq($DIFF -c "set titlestring=$title" "$file1" "$file2");
>> system qq($command);
>> The file on the left is a temporary file. The file on the right is the
>> actual file being compared.
>
> my problem is that some times svn will call the external diff command
> with $ARGV[$parameters - 1] or $7 in bash with something like
> /tmp/svndiff.c, and I don't understand why he can not rather use the
> real working copy.
>
Hi, let me make it clear: sometimes 'svn diff' command will generate
a file /tmp/svndiff.tmp as the right hand side file, and passwd the
name of the file to used defined external diff command such as
vimdiff. Could anyone tell me why this happend and how to avoid it.
Thanks in advance.
-
narke
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980262
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Edit working copy while see the 'diff'
Posted by Steven Woody <na...@gmail.com>.
On Fri, Dec 5, 2008 at 10:24 PM, David Weintraub <qa...@gmail.com> wrote:
> I also use vimdiff as my diff program when I do a "svn diff" on files, and I
> don't seem to have this issue. I can easily edit my current file (which
> appears on the right hand side).
> Here's my "diff" command:
> #! /usr/bin/env perl
> use strict;
> use warnings;
> my $DIFF = "/usr/local/bin/vimdiff";
> my $parameters = $#ARGV;
> my $file1 = $ARGV[$parameters - 1];
> my $file2 = $ARGV[$parameters];
> my $title1 = $ARGV[$parameters - 4];
> my $title2 = $ARGV[$parameters - 2];
> my $title = "$title1 - $title2";
> $title =~ s/\t/ /g;
> $title =~ s/ /\\ /g;
> my $command = qq($DIFF -c "set titlestring=$title" "$file1" "$file2");
> system qq($command);
> The file on the left is a temporary file. The file on the right is the
> actual file being compared.
my problem is that some times svn will call the external diff command
with $ARGV[$parameters - 1] or $7 in bash with something like
/tmp/svndiff.c, and I don't understand why he can not rather use the
real working copy.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980217
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Edit working copy while see the 'diff'
Posted by David Weintraub <qa...@gmail.com>.
I also use vimdiff as my diff program when I do a "svn diff" on files, and I
don't seem to have this issue. I can easily edit my current file (which
appears on the right hand side).
Here's my "diff" command:
#! /usr/bin/env perl
use strict;
use warnings;
my $DIFF = "/usr/local/bin/vimdiff";
my $parameters = $#ARGV;
my $file1 = $ARGV[$parameters - 1];
my $file2 = $ARGV[$parameters];
my $title1 = $ARGV[$parameters - 4];
my $title2 = $ARGV[$parameters - 2];
my $title = "$title1 - $title2";
$title =~ s/\t/ /g;
$title =~ s/ /\\ /g;
my $command = qq($DIFF -c "set titlestring=$title" "$file1" "$file2");
system qq($command);
The file on the left is a temporary file. The file on the right is the
actual file being compared.
--
David Weintraub
qazwart@gmail.com
On Fri, Dec 5, 2008 at 8:08 AM, Steven Woody <na...@gmail.com> wrote:
> Hi,
>
> My svn diff-cmd was set to use 'vim -d', it's great. But I found
> subversion is creating troubles for me when I in the 'vim -d' window,
> checking the differences and want to do a little modification to my
> working copy. You know, the $7 parameter the 'svn diff' command
> provided is actually a temporary file, which is a copy of my working
> copy not the real one. so in my 'vim -d''s right window, I can only
> edit/modify the fake copy.
>
> Is there a solution to the problem? Thanks in advance.
>
> -
> narke
>
> ------------------------------------------------------
>
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980080
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe@subversion.tigris.org].
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980122
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].