bugGNU TeXmacs - Bugs: bug #12968, TeXmacs files provoke conflicts...

 
 

You are not allowed to post comments on this tracker with your current authentication level.

bug #12968: TeXmacs files provoke conflicts with version control systems

Submitted by:  Andreas Kloeckner <inducer>
Submitted on:  Wed 04 May 2005 02:12:13 PM UTC  
 
Category: EditorPriority: 3 - Low
Item Group: WishlistStatus: Postponed
Privacy: PublicAssigned to: None
Originator Name: Open/Closed: Accepted
Release: Release: None
Fixed Release: NoneFixed Release: 
Keywords: 

Mon 12 Mar 2012 10:06:13 PM UTC, comment #2:

A possibility might be to have an option to disable storing of these sections.

Miguel de Benito <mdbenito>
Project Member
Wed 07 Mar 2012 09:46:11 PM UTC, comment #1:

TeXmacs now includes its own version control mechanism which is aware of the tree structure and also avoids this problem. Of course this is not exactly the solution to the problem but makes this a bit lower priority. (Yes, I noticed this item is seven years old...)

As a workaround Sam Liddicot proposed in texmacs-users that one uses sed to preprocess files before commiting to git, svn or whatever. His one liner is:

#! /bin/sed -f
/^\( <.table-of-contents\|<.references\|<.auxiliary\)/{h;/<\\/p};x;/^ <\\/{x;d};x

Miguel de Benito <mdbenito>
Project Member
Wed 04 May 2005 02:12:13 PM UTC, original submission:

When cooperatively editing TeXmacs files using version control systems such as Arch or CVS, the frequently-changing part at the end of each TeXmacs file (typically enclosed in <\references> or <\auxiliary>) constantly provokes merge conflicts. (Say, both participants add a chapter. Thus, a large part of the numbering references change in both copies, provoking a merge conflict. If this information wasn't stored (as in plain TeX files), the merge conflict would not occur.)

I assume that these sections store information that could be regenerated from the content of the file, so storing it is not absolutely necessary.

I suggest removing these sections and regenerating them upon load.

Andreas Kloeckner <inducer>

 

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by mdbenito (Posted a comment)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Please enter the title of George Orwell's famous dystopian book (it's a date):

     

     

    Follow 3 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Wed 07 Mar 2012 09:46:11 PM UTCmdbenitoPriority5 - Normal=>3 - Low
      StatusNone=>Postponed
      Open/ClosedOpen=>Accepted

    Back to the top


    Powered by Savane 3.1-cleanup1