mailing-list for TeXmacs Users

[Massimiliano Gubinelli <address@hidden>]

Hi all,

 I'm not sure I fully understand what Frank wants. My understanding of the versioning tool is that it produces a new document with tags recording the differences between two other documents as subtrees. At this point you have commands to replace selectively these tags with one of the two contents, removing the tag and the other branch altogether. So after you made your manual choices it would indeed be useful to have a command which make automatically one of the two choices to retain the old or the new version for all the remaining tags in the document. It could be a nice exercise to code one. :)

For the time being, if you do not have too many changes you can just do repeadedly Ctrl+1 to retain all the new versions, the cursor moves automatically to the next version tag so it will take just few strokes.

Best

Max

On 16. Jun 2021, at 06:26, Basile Audoly <address@hidden> wrote:

Hi Frank,

maybe it is obvious, maybe it does not work but… have you tried selecting the "rest" of the document before using the relevant menu command?

That being said, I believe merging has not been designed to be done in two steps: if you start over some other time, you will have to go again through the differences which you have already resolved by hand on your first round.

Best,

Basile

Le 15 juin 2021 à 23:27, Frank <address@hidden> a écrit :

Dear all,

I wonder how to go out of the version comparison mode. For example, I merge some differences, but for the other, I want to keep the old version and I will merge them the next time, say. Currently, I can only check them one by one. I wonder whether there is something like "retain old version for the rest" or "retain new version for the rest"?

Best wishes,
Frank