Re: [Issue 4149] New - psvn.el: ediff broken with new working copy layout

[Daniel Shahaf <da...@elego.de>]

Forwarding to maintainers

sq@ -- consider submitting a patch:
http://subversion.apache.org/patches

sq@tigris.org wrote on Wed, Mar 21, 2012 at 09:56:12 -0700:
> http://subversion.tigris.org/issues/show_bug.cgi?id=4149
>                  Issue #|4149
>                  Summary|psvn.el: ediff broken with new working copy layout
>                Component|subversion
>                  Version|1.7.x
>                 Platform|All
>                      URL|
>               OS/Version|All
>                   Status|NEW
>        Status whiteboard|
>                 Keywords|
>               Resolution|
>               Issue type|DEFECT
>                 Priority|P3
>             Subcomponent|tools
>              Assigned to|issues@subversion
>              Reported by|sq
> 
> 
> 
> 
> 
> 
> ------- Additional comments from sq@tigris.org Wed Mar 21 09:56:12 -0700 2012 -------
> svn-status-ediff-with-revision (bound to key 'E') does not work with current svn 
> working copy format because it tries to lookup pristine version of file in .svn 
> subdirectory.
> 
> The error message in emacs is like this:
> if: Opening input file: datei oder Verzeichnis nicht gefunden, 
> /my/project/trunk/module/.svn/text-base/myfile.h.svn-base
> 
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=463&dsMessageId=2938344
> 
> To unsubscribe from this discussion, e-mail: [issues-unsubscribe@subversion.tigris.org].

Re: [Issue 4149] New - psvn.el: ediff broken with new working copy layout

[Stefan Reichör <st...@xsteve.at>]

Greg Stein <gs...@gmail.com> writes:

> On Wed, Mar 21, 2012 at 19:18, Kalle Olavi Niemitalo <ko...@iki.fi> wrote:
>> Daniel Shahaf <da...@elego.de> writes:
>>
>>> Forwarding to maintainers
>>
>> Am I considered a maintainer of psvn.el because COMMITTERS
>> lists me as a dormant partial committer for that?
>
> Nah... I bet Daniel just gathered names from 'svn log psvn.el', and
> didn't consider to cross-ref with COMMITTERS. *shrug*
>
>>...
>> Regarding the bug itself: the fix may be as easy as
>> removing the (string= revision "BASE") special case
>> From svn-status-get-specific-revision-internal.
>> Then it'd run svn cat -r BASE file, which should work.
>
> Thanks! I don't really have a way to test this, but hopefully somebody
> can try that out and verify the fix.
>
> Cheers,
> -g

I am trying to fix the problem. Stefan Quandt will test the new version.
If he gives positive feedback, I will upload it to http://www.xsteve.at/prg/emacs/psvn.el


Stefan.

Re: [Issue 4149] New - psvn.el: ediff broken with new working copy layout

[Greg Stein <gs...@gmail.com>]

On Wed, Mar 21, 2012 at 19:18, Kalle Olavi Niemitalo <ko...@iki.fi> wrote:
> Daniel Shahaf <da...@elego.de> writes:
>
>> Forwarding to maintainers
>
> Am I considered a maintainer of psvn.el because COMMITTERS
> lists me as a dormant partial committer for that?

Nah... I bet Daniel just gathered names from 'svn log psvn.el', and
didn't consider to cross-ref with COMMITTERS. *shrug*

>...
> Regarding the bug itself: the fix may be as easy as
> removing the (string= revision "BASE") special case
> From svn-status-get-specific-revision-internal.
> Then it'd run svn cat -r BASE file, which should work.

Thanks! I don't really have a way to test this, but hopefully somebody
can try that out and verify the fix.

Cheers,
-g

Re: [Issue 4149] New - psvn.el: ediff broken with new working copy layout

[Daniel Shahaf <da...@elego.de>]

Kalle Olavi Niemitalo wrote on Thu, Mar 22, 2012 at 01:18:18 +0200:
> Daniel Shahaf <da...@elego.de> writes:
> 
> > Forwarding to maintainers
> 
> Am I considered a maintainer of psvn.el because COMMITTERS
> lists me as a dormant partial committer for that?
> It might be clearest to just delete that line and the
> corresponding access-control entry, as I really do not
> expect to make any changes to psvn.el.
> 

Your entry is actually listed under the "Partial committers who have
asked to be listed as dormant:" section.  My apologies for waking you up
--- I just grepped the file, I hadn't considered that some people are
marked as inactive.

> Regarding the bug itself: the fix may be as easy as 
> removing the (string= revision "BASE") special case
> From svn-status-get-specific-revision-internal.
> Then it'd run svn cat -r BASE file, which should work.

Re: [Issue 4149] New - psvn.el: ediff broken with new working copy layout

[Kalle Olavi Niemitalo <ko...@iki.fi>]

Daniel Shahaf <da...@elego.de> writes:

> Forwarding to maintainers

Am I considered a maintainer of psvn.el because COMMITTERS
lists me as a dormant partial committer for that?
It might be clearest to just delete that line and the
corresponding access-control entry, as I really do not
expect to make any changes to psvn.el.

Regarding the bug itself: the fix may be as easy as 
removing the (string= revision "BASE") special case
From svn-status-get-specific-revision-internal.
Then it'd run svn cat -r BASE file, which should work.