[darcs-users] Files supplied to the external merge command are missing a line of code

[Netocrat]

Using darcs 1.0.2, I'm finding apparently inconsistent behaviour between 
the commands:

darcs pull --external-merge 'kdiff3 --output %o %a %1 %2' <repository>

and

darcs pull <repository>

The second command marks conflicts in a file "env.c" like this:

v v v v v v v
			//fwprintf( stderr, L"Set $%ls to %ls\n", key, val );
			while( *pos )
			{
				if( *pos == L':' )
					*pos = ARRAY_SEP;
				pos++;
			}
*************
			do_arraysep_conv(key, pos, FROM_EXT);
//			fwprintf( stderr, L"Set $%ls to %ls\n", key, val );
^ ^ ^ ^ ^ ^ ^

None of the versions of env.c supplied to the external merge command 
contain the line:
			do_arraysep_conv(key, pos, FROM_EXT);
even though this line is contained within the patch being pulled.

The second version of env.c supplied to the external merge command - 
which otherwise contains the contents of the patch - lists only this 
code in the relevant section:

			while( *pos )
			{
				if( *pos == L':' )
					*pos = ARRAY_SEP;
				pos++;
			}
//			fwprintf( stderr, L"Set $%ls to %ls\n", key, val );

Why is the line containing the call to do_arraysep_conv missing?

-- 
http://members.dodo.com.au/~netocrat