[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [Issue 2950] New - Weird prompting to resolve conflicts when EDITOR is not defined

From: Augie Fackler <durin42_at_gmail.com>
Date: 2007-10-03 17:00:25 CEST

On Oct 3, 2007, at 10:23 AM, Mark Phippard wrote:

> On 10/3/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
>> On 10/3/07, Mark Phippard <markphip@gmail.com> wrote:
>>> On 10/3/07, Erik Huelsmann <ehuels@gmail.com> wrote:
>>>> On 10/3/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
>>>>> On 10/2/07, Mark Phippard <markphip@gmail.com> wrote:
>>>>>> Did you try this on your Mac? I get the same behavior as
>>>>>> Augie when I
>>>>>> try this on OSX. I'll be happy to try it again after the
>>>>>> patch is
>>>>>> committed.
>>>>>
>>>>> Yes, this is a transcript from my Mac.
>>>>
>>>> Are you all using recent/current trunk versions? Could anything
>>>> have
>>>> happened in the mean time?
>>>
>>> Did a HEAD build last night and I still get it on OSX.
>>
>> I still can't reproduce on my Mac, using HEAD. Can you apply dlr's
>> proposed patch, see if it fixes the problem?
>
> I applied Dan's patch and I still have the problem. Other than
> changing the colors, I am just using the default OSX terminal.

Just tried here with and without the patch, reproduced the problem
using both Terminal.app and the xterm that comes with Apple's X11,
both in 10.4.10.

I just wrote a test here to try and check and see what's going on:

[imladris:~] durin% cat test.c
[10/03/07 10:55AM]
#include <stdio.h>
#include <unistd.h>

int main()
{
   printf("o");
   fprintf(stderr, "e");
   system("sleep 1");
   printf("o\n");
   fprintf(stderr, "e\n");
   system("sleep 1");
   return 0;
}
[imladris:~] durin% cc test.c -o test
[10/03/07 10:55AM]
[imladris:~] durin% ./test
[10/03/07 10:55AM]
eoo
e
[imladris:~] durin%
[10/03/07 10:55AM]

Which means that stderr should be defaulting to no buffering, and
stdout should be defaulting to line buffering, as set in the patch. A
quick dance with gdb suggests that nothing else is calling setvbuf
(called only twice, both times in svn_cmdline_init), which leaves me
even more confused as to why this isn't behaving normally.

Augie

(Mark, sorry about the double-send, I fail at Mail.app today)

>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 3 17:00:48 2007

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.