-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi Stefan,
>>
>> 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
Mercurial version: Mercurial Distributed SCM (version 0.9.4)
Copyright (C) 2005-2007 Matt Mackall <[EMAIL PROTECTED]> and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> Could you please try "hg diff" in a shell and send the output.
$ hg diff
diff --git a/tools/common_gen.ml b/tools/common_gen.ml
- --- a/tools/common_gen.ml
+++ b/tools/common_gen.ml
@@ -14,7 +14,6 @@ type extra_fields = {
ef_type : string list;
ef_tt2s : string list;
ef_tag2tt : string list;
- - ef_push : string list;
ef_extract : string list;
}
let extra_fields_none = {
@@ -26,7 +25,6 @@ let extra_fields_none = {
ef_type = [];
ef_tt2s = [];
ef_tag2tt = [];
- - ef_push = [];
ef_extract = [];
}
@@ -72,12 +70,14 @@ end) = struct
.....
it does appear as if the "text on the same line as @@" behavior is
already in hg output
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFG8CglPp1Qsf2qnMcRAn50AKCxVshRcz6iUy7IJ89oTBaffinSiwCZAQHz
X+D2w7JdbQRBptNI6Uecuwk=
=gQ7g
-----END PGP SIGNATURE-----
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
