公开(公告)号：US07299450B2

公开(公告)日：2007-11-20

申请号：US10463152

申请日：2003-06-17

申请人： Artem Y. Livshits ,  Christopher J. Antos

发明人： Artem Y. Livshits ,  Christopher J. Antos

IPC分类号： G06F9/44

CPC分类号： G06F8/71

摘要： Carrying out maintaining a software configuration management system are disclosed. In particular, a way to reverse prior revisions without removing their history in the server are described. When a client submits an undo command to reverse the effects of one or more revisions within a stated revision range of a file, the revision history is updated by submitting a new revision that effectively removes the changes embodied within the range of undone revisions. Implementing undoing prior revisions preserves the revision history for a file, in case there is a need to access the undone revisions at a later time.

摘要翻译： 公开了维护软件配置管理系统。 特别地，描述了在不删除其在服务器中的历史的情况下反转先前修订的方式。 当客户端提交撤消命令以扭转文件的规定修订版本范围内的一个或多个修订版本的影响时，将通过提交新的修订版来更新修订版本历史记录，以便有效地删除在撤销版本范围内所体现的更改。 执行撤销先前修订保留文件的修订历史记录，以防在以后需要访问撤消的修订版本。

公开(公告)号：US06904430B1

公开(公告)日：2005-06-07

申请号：US10133520

申请日：2002-04-26

申请人： Artem Y. Livshits

发明人： Artem Y. Livshits

IPC分类号： G06F17/22 ,  G06F17/30

CPC分类号： G06F17/2211 ,  Y10S707/99933 ,  Y10S707/99936 ,  Y10S707/99943

摘要： Methods and data structures are disclosed for carrying out identifying differences between large files comprising many lines (or other units of comparison such as rows, words, paragraphs, sentences, etc.). The disclosed methods and data structures facilitate and carry out a streamlined, yet thorough comparison of two files to identify differences between them. The streamlining is achieved by pre-processing the files prior to submitting them to any known longest common subsequence (LCS) search engine. The output of the LCS generator is post-processed to compensate for changes to the sequences introduced by the pre-processing stage.

摘要翻译： 公开了用于执行包括许多行（或诸如行，单词，段落，句子等的其他比较单位）的大文件之间的识别差异的方法和数据结构。 所公开的方法和数据结构促进并执行两个文件的简化但彻底的比较以识别它们之间的差异。 通过在将文件提交到任何已知的最长公共子序列（LCS）搜索引擎之前预处理文件来实现精简。 后处理LCS发生器的输出以补偿由预处理阶段引入的序列的变化。

公开(公告)号：US07076486B2

公开(公告)日：2006-07-11

申请号：US11034965

申请日：2005-01-14

申请人： Artem Y. Livshits

发明人： Artem Y. Livshits

IPC分类号： G06F17/30 ,  G06F12/00 ,  G06K9/00

CPC分类号： G06F17/2211 ,  Y10S707/99933 ,  Y10S707/99936 ,  Y10S707/99943

摘要： Methods and data structures are disclosed for carrying out identifying differences between large files comprising many lines (or other units of comparison such as rows, words, paragraphs, sentences, etc.). The disclosed methods and data structures facilitate and carry out a streamlined, yet thorough comparison of two files to identify differences between them. The streamlining is achieved by pre-processing the files prior to submitting them to any known longest common subsequence (LCS) search engine. The output of the LCS generator is post-processed to compensate for changes to the sequences introduced by the pre-processing stage.

摘要翻译： 公开了用于执行包括许多行（或诸如行，单词，段落，句子等的其他比较单位）的大文件之间的识别差异的方法和数据结构。 所公开的方法和数据结构促进并执行两个文件的简化但彻底的比较以识别它们之间的差异。 通过在将文件提交到任何已知的最长公共子序列（LCS）搜索引擎之前预处理文件来实现精简。 后处理LCS发生器的输出以补偿由预处理阶段引入的序列的变化。

公开(公告)号：US07653643B2

公开(公告)日：2010-01-26

申请号：US11088378

申请日：2005-03-24

申请人： Artem Y. Livshits

发明人： Artem Y. Livshits

IPC分类号： G06F7/00 ,  G06F12/00

CPC分类号： H03M7/30 ,  Y10S707/99942

摘要： A configuration management system that uses a data compression method to compress entries in a data set. An entry is selected as a prefix value and prefix compression of the data set is performed. The entry to serve as the prefix value is quickly selected using an iterative approach. In each iteration, subgroups of entries are formed from groups formed in prior iterations based on the values of characters at successive positions in the entries. The approach is readily implemented using data structures represented as lists.

摘要翻译： 一种使用数据压缩方法来压缩数据集中的条目的配置管理系统。 选择一个条目作为前缀值，并执行数据集的前缀压缩。 作为前缀值的条目使用迭代方法快速选择。 在每次迭代中，条目的子组基于在条目中的连续位置处的字符的值由在先前迭代中形成的组形成。 使用表示为列表的数据结构容易地实现该方法。

公开(公告)号：US08306956B2

公开(公告)日：2012-11-06

申请号：US11888272

申请日：2007-07-31

申请人： Artem Y. Livshits

发明人： Artem Y. Livshits

IPC分类号： G06F7/00 ,  G06F17/00 ,  H03M5/00 ,  H03M7/00

CPC分类号： H03M7/30 ,  Y10S707/99942

摘要： A configuration management system that uses a data compression method to compress entries in a data set. An entry is selected as a prefix value and prefix compression of the data set is performed. The entry to serve as the prefix value is quickly selected using an iterative approach. In each iteration, subgroups of entries are formed from groups formed in prior iterations based on the values of characters at successive positions in the entries. The approach is readily implemented using data structures represented as lists.

摘要翻译： 一种使用数据压缩方法来压缩数据集中的条目的配置管理系统。 选择一个条目作为前缀值，并执行数据集的前缀压缩。 作为前缀值的条目使用迭代方法快速选择。 在每次迭代中，条目的子组基于在条目中的连续位置处的字符的值由在先前迭代中形成的组形成。 使用表示为列表的数据结构容易地实现该方法。

公开(公告)号：US07290251B2

公开(公告)日：2007-10-30

申请号：US10440339

申请日：2003-05-16

申请人： Artem Y. Livshits

发明人： Artem Y. Livshits

IPC分类号： G06F9/44 ,  G06F15/00

CPC分类号： G06F17/2211 ,  G06F8/71

摘要： A method and system provides an improved representation of merge conflicts in a three-way merge operation of three sequences: Original, Version1, and Version2. A merge program first compares the three sequences to identify a list of difference chunks of elements between the Original and Version1, and a list of difference chunks between the Original and Version2. From the two sets of difference chunks, the merge program creates an annotated list of chunks. Each chunk in the annotated list is identified by a conflict flag that indicates whether the chunk is a part of a conflict and if it is, what sequence(s) being merged it belongs to. A merged document is then constructed based on the annotated list of chunks, with the chunks identified in the merged document with conflict markers for viewing by a user.

摘要翻译： 一种方法和系统在三个序列的三次合并操作中提供了合并冲突的改进表示：原始版本1和版本2。 合并程序首先比较三个序列以识别原始版本和版本1之间元素的不同块的列表，以及原始版本和版本2之间的差异块列表。 从两组不同的块中，合并程序创建一个注释的块列表。 注释列表中的每个块都用冲突标志来标识，该冲突标志指示该块是否是冲突的一部分，如果是，它属于哪个合并的序列。 然后，基于批注的块列表构建合并的文档，其中在合并的文档中识别出具有用于用户查看的冲突标记的块。