Hello,
On Thu, Jun 14, 2007 at 06:01:23PM +0200, Eugen Dedu wrote:
> [EMAIL PROTECTED] wrote:
> >Eugen Dedu writes:
> >>Package: unison-gtk
> >>Version: 2.13.16-6
> >>Severity: normal
> >>Hi,
> >>I find very confusing the name of files in the diff window (when
> >>pressing the diff button in the graphical environment unison-gtk).
> >>What is the first file and what is the second? diff -u .../intro.tex
> >>and .../intro.tex#unisondiff- say nothing about that.
> >>I checked this and the 1st file is the local file, the 2nd is the
> >>remote file. I would prefer the 1st one be the remote file and the
> >>2nd one my own file, because the remote file is the "old" version,
> >>isn't it?
> >>So I propose:
> >>- to put as 1st file the remote file
> >>- to name the remote file something like this: .../intro.tex#remotefile
> >>Thank you for taking into account this bug.
> >
> >Well, i am not sure that the remote file is always the "old" file, and
> >i think that putting it 1st or 2nd doesn't really improve anything.
> >Concerning the naming convention, i think that the first filename
> >(.../intro.tex) should point to the fact that this is a local file...
>
> Hi,
>
> I agree with the order, because there are different uses of the program
> ("old" sometimes is local, sometimes is distant).
>
> However, the names are not explicit.
>
> Aa program must be as clear as possible. Without reading the
> documentation, do you agree to lose 100€ if ../intro.tex is not the
> local one and ../intro.tex#unisondiff- is not the distant one?
>
Well in fact the program don't choose for you what to loose! And you
agree to loose 100€ by not reading the documentation and choosing the
way you want to propagate things.
> I think that "Remote file" for ex. is a much better name. For example,
> changing the window title to "diff -u localFile remoteFile" would be
> clearer. The first two lines of the diff window provide the name of the
> two files.
>
> What does "unisondiff-" say? Nothing! On the contrary, "remoteFile" is
> explicit.
>
> If you still think I am wrong, you can close the bug...
>
I am just telling you that i "sort of" agree on the fact that
"#unisondiff" is not explicit but i just point that the name of the
other file is anyway local. I.e. at least there is an explicit
difference between local and remote (remote name is dumb but local name
is explicit and look like a normal filename without ending #anything)
> >To sum up, i am not sure changing this behavior will really improve
> >usability.
> >Regards
> >Sylvain Le Gall
> >ps: diff-ing two files can be confusing even with what you propose
> >pps: if you really want you can set your own diff command, that will do
> >exactly what you ask (see unison documentation)
>
> Yes, I saw, thank you. This is for changing 1st and 2nd file, but not
> to have more explicit names.
Well, in fact, you won't change the window title but you can change what
is inside the window : create a script that begin by doing "mv $2
${2##unisondiff}remotefile; diff $1 ${2##unisondiff}remotefile". This
way you will have inside the window a name change...
Regards
Sylvain Le Gall
