mailing-list for TeXmacs Users

[Frank <address@hidden>]

Hi Joris,

I am not sure 3-way diff would help - it might help for cooperation, I think.

I did not understand how to use `comment` package - I looked at this package, and seemingly I need a lot of 
parameters, including an "id" for that. I don't know whether they will vanish after setting to 
"hidden" mode somehow. Previously, I tried to hide something through macro, but when it is about 
paragraph-long comment, after "hidden" there will be an empty paragraph which occupies a space.

Best,
Frank

On 6/17/21, TeXmacs wrote:
> On Thu, Jun 17, 2021 at 08:33:55AM +0200, Basile Audoly wrote:
> > I don't know your workflow exactly so it is difficult to answer but
> > (1) my understanding is that the version comparison mode was intended to 
> > resolve differences at a point in time,
> > not for keeping documents synchronized over time,
>
> That is right.  You can consider the resulting file to be
> similar to a "conflict" file when using a versioning tool.
> Such a file is transient, by design: you don't want to end
> up comparing differences between differences.
>
> One thing that was not implemented yet, but that we might
> consider doing are differences between more than two versions.
> This might be useful for merging different branches.
> But I don't recommend turning diff files into working versions.
>
> > and (2) I would recommend that you try instead consolidating everything in a 
> > single document, by using switches, hiding/revealing all comments, etc. 
> > Dealing with redundant information across documents is always a mess no 
> > matter how.
>
> Yes, you may use the new 'comment' package whenever you are hesitating and
> turn undecided differences into comments.
>
> Best wishes, --Joris