First login?
Lost password?
 
 
 
mailing-list for TeXmacs Users

Text archives Help


Re: TeXmacs: How to "retain old/new version" for every difference?


Chronological Thread 
  • From: Frank <address@hidden>
  • To: address@hidden
  • Subject: Re: TeXmacs: How to "retain old/new version" for every difference?
  • Date: Wed, 16 Jun 2021 15:52:56 +0200
Hi Joris,

One natural working situation is the following: I have a "dirty" version with \todo
notes and something else, and I have a cleaned version. Then I want to transport the
modifications between these two versions. Maybe there is a better way to keep them
"synchronized"?

And there are situations that I need to postpone the merge - for example, the
mathematics involved cannot be easily determined for the moment.

Best,
Frank

On 6/16/21, TeXmacs wrote:
Hi Frank,

Things used to work as Basile indicates.

Now I recently wanted to improve the indicated keyboard shortcuts
in the menus, but this seems to trigger some weird (possibly Qt-related) bug.

I reverted my changes in revision 13537,
so things should work as normal in the next version.

Best wishes, --Joris



On Wed, Jun 16, 2021 at 06:26:33AM +0200, Basile Audoly 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


Archive powered by MHonArc 2.6.19.

Top of page