Either no-one knows the answer or my first post to the list came across
as peremptory (I was aiming to be concise). In case it's the second,
I'll clarify that before asking I did RTFM (for 1.0.2 and the version on
the web), searched the bugs database, read selected parts of the wiki,
non-exhaustively read the theory of patches and the FAQ, none of which
seemed to explain the behaviour I describe. I haven't been following
the list but before posting I read a few recent messages from the
archives. I code but don't know Haskell and haven't examined the source.
A quick answer that indicates whether this is expected behaviour or not
would be great, because by my current understanding, something is amiss
and I can't trust the external merge functionality of the version of
darcs that I am running (as provided by Gentoo Linux's package manager).
[original post follows in its entirety with no further comments]
Netocrat wrote:
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
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
