Hi Sam!
> Stefan Reichör wrote:
>> Sam Steingold <[EMAIL PROTECTED]> writes:
>>
>>> Stefan Reichör wrote:
>>
>>>> What is the content of your dvc-status or dvc-diff buffers?
>>> status, indeed, displays a list of modified files and lets me select
>>> which files to commit.
>>> alas, diff displayed just the diffs for all the modified files without a
>>> separate file list.
>>
>> Here is how it should look like for dvc-diff:
>>
>> M LinuxLanguageApps.muse
>> M WindowsEmulation.muse
>>
>>
>> diff -r e744797b0fe0 LinuxLanguageApps.muse
>> --- a/LinuxLanguageApps.muse Mon Sep 17 20:16:48 2007 +0200
>> +++ b/LinuxLanguageApps.muse Tue Sep 18 20:43:04 2007 +0200
>> @@ -8,3 +8,6 @@
>> * mulvoc
>> - MUlti-LIngual VOCabulary for emacs
> ......
>>
>> The file list is on top and the diffs are displayed below. You can mark the
>> files on top.
>>
>> Does this work for you?
>
> nope. I see a separator line (which does not come with copy/paste, for
> some reason - C-x = reports spaces there), whitespace above and diff
> below:
>
>
> diff --git a/... b/...
> --- a/...
> +++ b/...
> @@ -10,7 +10,7 @@ type t = [
> ...
>
> hey, I just noticed that the diff is broken!
> look, some of the code ("type t = [") is put on the same line as the
> "@@" markers!
>
> I suspect that some things are invisible in that buffer, but I have no
> idea about how to detect invisible text.
There is no invisible text. It works a bit different:
The output of the diff command is parsed and the result is put in the
xhg-diff buffer.
One thing that looks suspicious is the --git option above.
What does M-x xhg-command-version display.
I use hg 0.9.3 on ubuntu 7.04
Could you please try "hg diff" in a shell and send the output.
We need to adapt the parser routine for this diff output
Stefan.
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
