CN100452038C - 管理文件修订的方法与系统 - Google Patents
管理文件修订的方法与系统 Download PDFInfo
- Publication number
- CN100452038C CN100452038C CNB2005101203786A CN200510120378A CN100452038C CN 100452038 C CN100452038 C CN 100452038C CN B2005101203786 A CNB2005101203786 A CN B2005101203786A CN 200510120378 A CN200510120378 A CN 200510120378A CN 100452038 C CN100452038 C CN 100452038C
- Authority
- CN
- China
- Prior art keywords
- version
- modification
- indicated
- file
- new
- Prior art date
- Legal status (The legal status is an assumption and is not a legal conclusion. Google has not performed a legal analysis and makes no representation as to the accuracy of the status listed.)
- Expired - Fee Related
Links
- 238000000034 method Methods 0.000 title claims abstract description 25
- 238000012986 modification Methods 0.000 claims abstract description 100
- 230000004048 modification Effects 0.000 claims abstract description 100
- 230000004044 response Effects 0.000 claims abstract description 12
- 238000004519 manufacturing process Methods 0.000 claims description 15
- 238000012423 maintenance Methods 0.000 claims description 3
- 230000008676 import Effects 0.000 claims 2
- 230000008859 change Effects 0.000 description 20
- 238000003860 storage Methods 0.000 description 7
- 230000005540 biological transmission Effects 0.000 description 3
- 238000012545 processing Methods 0.000 description 3
- 238000012217 deletion Methods 0.000 description 2
- 230000037430 deletion Effects 0.000 description 2
- 238000005516 engineering process Methods 0.000 description 2
- 230000009471 action Effects 0.000 description 1
- 239000012141 concentrate Substances 0.000 description 1
- 238000007596 consolidation process Methods 0.000 description 1
- 238000011161 development Methods 0.000 description 1
- 238000007689 inspection Methods 0.000 description 1
- 230000002452 interceptive effect Effects 0.000 description 1
- 230000014759 maintenance of location Effects 0.000 description 1
- 230000003287 optical effect Effects 0.000 description 1
- 238000006116 polymerization reaction Methods 0.000 description 1
- 230000008569 process Effects 0.000 description 1
- 238000012546 transfer Methods 0.000 description 1
Images
Classifications
-
- G—PHYSICS
- G06—COMPUTING; CALCULATING OR COUNTING
- G06F—ELECTRIC DIGITAL DATA PROCESSING
- G06F8/00—Arrangements for software engineering
- G06F8/70—Software maintenance or management
- G06F8/71—Version control; Configuration management
-
- G—PHYSICS
- G06—COMPUTING; CALCULATING OR COUNTING
- G06F—ELECTRIC DIGITAL DATA PROCESSING
- G06F16/00—Information retrieval; Database structures therefor; File system structures therefor
- G06F16/10—File systems; File servers
- G06F16/18—File system types
- G06F16/1873—Versioning file systems, temporal file systems, e.g. file system supporting different historic versions of files
Abstract
Description
Claims (16)
Applications Claiming Priority (2)
Application Number | Priority Date | Filing Date | Title |
---|---|---|---|
US10/987,382 US20060106889A1 (en) | 2004-11-12 | 2004-11-12 | Method, system, and program for managing revisions to a file |
US10/987,382 | 2004-11-12 |
Publications (2)
Publication Number | Publication Date |
---|---|
CN1773506A CN1773506A (zh) | 2006-05-17 |
CN100452038C true CN100452038C (zh) | 2009-01-14 |
Family
ID=36387721
Family Applications (1)
Application Number | Title | Priority Date | Filing Date |
---|---|---|---|
CNB2005101203786A Expired - Fee Related CN100452038C (zh) | 2004-11-12 | 2005-11-11 | 管理文件修订的方法与系统 |
Country Status (2)
Country | Link |
---|---|
US (1) | US20060106889A1 (zh) |
CN (1) | CN100452038C (zh) |
Cited By (1)
Publication number | Priority date | Publication date | Assignee | Title |
---|---|---|---|---|
WO2022127557A1 (zh) * | 2020-12-16 | 2022-06-23 | 华为云计算技术有限公司 | 代码分析的方法和相关设备 |
Families Citing this family (37)
Publication number | Priority date | Publication date | Assignee | Title |
---|---|---|---|---|
US8238696B2 (en) | 2003-08-21 | 2012-08-07 | Microsoft Corporation | Systems and methods for the implementation of a digital images schema for organizing units of information manageable by a hardware/software interface system |
US8166101B2 (en) | 2003-08-21 | 2012-04-24 | Microsoft Corporation | Systems and methods for the implementation of a synchronization schemas for units of information manageable by a hardware/software interface system |
US7644239B2 (en) * | 2004-05-03 | 2010-01-05 | Microsoft Corporation | Non-volatile memory cache performance improvement |
US7366740B2 (en) * | 2004-05-03 | 2008-04-29 | Microsoft Corporation | Systems and methods for automatic maintenance and repair of enitites in a data model |
US7490197B2 (en) | 2004-10-21 | 2009-02-10 | Microsoft Corporation | Using external memory devices to improve system performance |
US8719786B2 (en) * | 2005-03-30 | 2014-05-06 | Alcatel Lucent | Method for performing conditionalized N-way merging of source code |
US8914557B2 (en) | 2005-12-16 | 2014-12-16 | Microsoft Corporation | Optimizing write and wear performance for a memory |
US7797743B2 (en) * | 2007-02-26 | 2010-09-14 | Microsoft Corporation | File conversion in restricted process |
CN101641678B (zh) * | 2007-04-09 | 2012-03-21 | 富士通株式会社 | 源程序再次研究方法及源程序再次研究装置 |
US8631203B2 (en) | 2007-12-10 | 2014-01-14 | Microsoft Corporation | Management of external memory functioning as virtual cache |
JP5067235B2 (ja) * | 2008-03-28 | 2012-11-07 | 富士通株式会社 | 設計支援システム及び設計支援プログラム |
US20090307274A1 (en) * | 2008-06-06 | 2009-12-10 | Microsoft Corporation | Delayed merge |
US7899883B2 (en) * | 2008-06-13 | 2011-03-01 | Microsoft Corporation | Merging versions of documents using multiple masters |
US9311626B2 (en) * | 2008-08-07 | 2016-04-12 | International Business Machines Corporation | Electronic mail reply with update |
US8032707B2 (en) | 2008-09-15 | 2011-10-04 | Microsoft Corporation | Managing cache data and metadata |
US9032151B2 (en) | 2008-09-15 | 2015-05-12 | Microsoft Technology Licensing, Llc | Method and system for ensuring reliability of cache data and metadata subsequent to a reboot |
JP5239674B2 (ja) * | 2008-09-17 | 2013-07-17 | 株式会社リコー | 情報処理装置、処理制御方法、プログラムおよび記録媒体 |
US7953774B2 (en) | 2008-09-19 | 2011-05-31 | Microsoft Corporation | Aggregation of write traffic to a data store |
JPWO2010044150A1 (ja) * | 2008-10-15 | 2012-03-08 | 富士通株式会社 | プログラム変更管理装置、プログラム変更管理プログラムおよびプログラム変更管理方法 |
US9069751B1 (en) * | 2009-07-21 | 2015-06-30 | Exelis, Inc. | Systems and methods for managing document pedigrees |
US8789024B2 (en) * | 2009-11-04 | 2014-07-22 | Red Hat, Inc. | Integration of visualization with source code in the Eclipse development environment |
US8893093B2 (en) * | 2010-05-07 | 2014-11-18 | Salesforce.Com, Inc. | Method and system for automated performance testing in a multi-tenant environment |
CN102314411B (zh) * | 2010-06-30 | 2015-02-18 | 百度在线网络技术(北京)有限公司 | 处理词条编创冲突的方法与系统 |
CN101937457A (zh) * | 2010-08-31 | 2011-01-05 | 中山大学 | 一种基于html的版本管理方法及系统 |
CN102799569A (zh) * | 2011-05-27 | 2012-11-28 | 汉王科技股份有限公司 | 一种epub文档的校对方法及装置 |
CN103020026B (zh) * | 2012-11-15 | 2016-05-25 | 无锡永中软件有限公司 | 协同文档处理系统及方法 |
US20150286623A1 (en) * | 2014-04-02 | 2015-10-08 | Samsung Electronics Co., Ltd. | Method and apparatus for marking relevant updates to html 5 |
KR101634571B1 (ko) * | 2014-07-31 | 2016-07-08 | 주식회사 파수닷컴 | 문서 동기화 방법 및 컴퓨터 프로그램, 그 기록매체 |
CN105183789A (zh) * | 2015-08-21 | 2015-12-23 | 福建天晴数码有限公司 | 基于git源代码冲突的文件合并方法及系统 |
US10261782B2 (en) * | 2015-12-18 | 2019-04-16 | Amazon Technologies, Inc. | Software container registry service |
US9977786B2 (en) * | 2015-12-23 | 2018-05-22 | Github, Inc. | Distributed code repository with limited synchronization locking |
US9430748B1 (en) | 2016-01-29 | 2016-08-30 | International Business Machines Corporation | Verifying historical artifacts in disparate source control systems |
US9747098B2 (en) | 2016-01-29 | 2017-08-29 | International Business Machines Corporation | Verifying source code in disparate source control systems |
CN106406918B (zh) * | 2016-11-25 | 2020-02-28 | 华胜信泰信息产业发展有限公司 | 源代码自动合并方法和源代码自动合并装置 |
US10146530B1 (en) | 2017-07-12 | 2018-12-04 | International Business Machines Corporation | Simulating and evaluating code branch merge |
CN110069455B (zh) * | 2017-09-21 | 2021-12-14 | 北京华为数字技术有限公司 | 一种文件合并方法及装置 |
CN113110868B (zh) * | 2021-04-07 | 2023-08-08 | 网易(杭州)网络有限公司 | 文件合并方法、装置、计算机设备及存储介质 |
Citations (5)
Publication number | Priority date | Publication date | Assignee | Title |
---|---|---|---|---|
US6226652B1 (en) * | 1997-09-05 | 2001-05-01 | International Business Machines Corp. | Method and system for automatically detecting collision and selecting updated versions of a set of files |
CN1310388A (zh) * | 2000-02-21 | 2001-08-29 | 英业达股份有限公司 | 借由增量的方式来使数据文件升级的方法 |
US20040031027A1 (en) * | 2002-08-08 | 2004-02-12 | Hiltgen Daniel K. | System for updating diverse file versions |
US6757893B1 (en) * | 1999-12-17 | 2004-06-29 | Canon Kabushiki Kaisha | Version control system for software code |
US20040177343A1 (en) * | 2002-11-04 | 2004-09-09 | Mcvoy Lawrence W. | Method and apparatus for understanding and resolving conflicts in a merge |
Family Cites Families (19)
Publication number | Priority date | Publication date | Assignee | Title |
---|---|---|---|---|
US5193191A (en) * | 1989-06-30 | 1993-03-09 | Digital Equipment Corporation | Incremental linking in source-code development system |
US5579223A (en) * | 1992-12-24 | 1996-11-26 | Microsoft Corporation | Method and system for incorporating modifications made to a computer program into a translated version of the computer program |
US5522079A (en) * | 1993-06-14 | 1996-05-28 | International Business Machines Corporation | Compiler merging new and preexisting modules while preserving function order |
US6760840B1 (en) * | 1994-03-15 | 2004-07-06 | Kabushiki Kaisha Toshiba | File editing system and shared file editing system with file content secrecy, file version management, and asynchronous editing |
US5745906A (en) * | 1995-11-14 | 1998-04-28 | Deltatech Research, Inc. | Method and apparatus for merging delta streams to reconstruct a computer file |
US5729743A (en) * | 1995-11-17 | 1998-03-17 | Deltatech Research, Inc. | Computer apparatus and method for merging system deltas |
US5878414A (en) * | 1997-06-06 | 1999-03-02 | International Business Machines Corp. | Constructing a transaction serialization order based on parallel or distributed database log files |
US6216140B1 (en) * | 1997-09-17 | 2001-04-10 | Hewlett-Packard Company | Methodology for the efficient management of hierarchically organized information |
NL1007462C1 (nl) * | 1997-11-06 | 1997-11-28 | Nederland Ptt | Werkwijze en systeem voor de generatie van bedrijfsinformatie. |
US6393437B1 (en) * | 1998-01-27 | 2002-05-21 | Microsoft Corporation | Web developer isolation techniques |
EP0981099A3 (en) * | 1998-08-17 | 2004-04-21 | Connected Place Limited | A method of and an apparatus for merging a sequence of delta files |
US6336217B1 (en) * | 1998-12-30 | 2002-01-01 | International Business Machines Corporation | Systems, methods and computer program products for end-to-end software development process automation |
US6460052B1 (en) * | 1999-08-20 | 2002-10-01 | Oracle Corporation | Method and system for performing fine grain versioning |
US6449624B1 (en) * | 1999-10-18 | 2002-09-10 | Fisher-Rosemount Systems, Inc. | Version control and audit trail in a process control system |
GB9930124D0 (en) * | 1999-12-21 | 2000-02-09 | Ibm | File system for a computer and method of synchronising sets of files |
US6415299B1 (en) * | 2000-04-12 | 2002-07-02 | Unisys Corp. | Method for merging versions of a model in an object oriented repository |
US7532340B2 (en) * | 2002-04-19 | 2009-05-12 | Toshiba Tec Kabushiki Kaisha | Document management system rule-based automation |
US7203708B2 (en) * | 2003-11-06 | 2007-04-10 | Microsoft Corporation | Optimizing file replication using binary comparisons |
US7487471B2 (en) * | 2004-07-23 | 2009-02-03 | Sap Ag | User interface for conflict resolution management |
-
2004
- 2004-11-12 US US10/987,382 patent/US20060106889A1/en not_active Abandoned
-
2005
- 2005-11-11 CN CNB2005101203786A patent/CN100452038C/zh not_active Expired - Fee Related
Patent Citations (5)
Publication number | Priority date | Publication date | Assignee | Title |
---|---|---|---|---|
US6226652B1 (en) * | 1997-09-05 | 2001-05-01 | International Business Machines Corp. | Method and system for automatically detecting collision and selecting updated versions of a set of files |
US6757893B1 (en) * | 1999-12-17 | 2004-06-29 | Canon Kabushiki Kaisha | Version control system for software code |
CN1310388A (zh) * | 2000-02-21 | 2001-08-29 | 英业达股份有限公司 | 借由增量的方式来使数据文件升级的方法 |
US20040031027A1 (en) * | 2002-08-08 | 2004-02-12 | Hiltgen Daniel K. | System for updating diverse file versions |
US20040177343A1 (en) * | 2002-11-04 | 2004-09-09 | Mcvoy Lawrence W. | Method and apparatus for understanding and resolving conflicts in a merge |
Cited By (1)
Publication number | Priority date | Publication date | Assignee | Title |
---|---|---|---|---|
WO2022127557A1 (zh) * | 2020-12-16 | 2022-06-23 | 华为云计算技术有限公司 | 代码分析的方法和相关设备 |
Also Published As
Publication number | Publication date |
---|---|
CN1773506A (zh) | 2006-05-17 |
US20060106889A1 (en) | 2006-05-18 |
Similar Documents
Publication | Publication Date | Title |
---|---|---|
CN100452038C (zh) | 管理文件修订的方法与系统 | |
KR101246996B1 (ko) | 전자 데이터 스냅샷 생성기 | |
CN100414547C (zh) | 用于访问文件系统快照的方法和文件系统 | |
US6505212B2 (en) | System and method for website development | |
CN102132273B (zh) | 注释网页内容 | |
US7574488B2 (en) | Method and apparatus for peer-to-peer file sharing | |
US20040216084A1 (en) | System and method of managing web content | |
US7028032B1 (en) | Method of updating network information addresses | |
US7765464B2 (en) | Method and system for dynamically assembling presentations of web pages | |
US20080282175A1 (en) | Automatically encoded, gracefully degrading panels | |
US20050033728A1 (en) | Methods, systems, architectures and data structures for delivering software via a network | |
US8572032B2 (en) | Method and apparatus for editing a production data store by shadowing content | |
US20070143242A1 (en) | Disk-based cache | |
JP2005346717A (ja) | データソースを発見して接続するための方法、システムおよび装置 | |
CN101268464A (zh) | 使用文档使用统计量的排位函数 | |
ZA200503578B (en) | Adaptively interfacing with a data repository | |
US20080301299A1 (en) | Automatically targeting and filtering shared network resources | |
US11080344B2 (en) | Cloud-native documents integrated with legacy tools | |
JP2007526543A (ja) | ジャーナリングおよび親マップ置換を含むWebサイト開発用システムおよび方法 | |
JP2011191862A (ja) | ファイル管理装置、ファイル管理システム、およびファイル管理プログラム | |
JP4068373B2 (ja) | 近位キューを使用するウェブサイトの使用を予測するための方法 | |
US9766949B2 (en) | System and method for locking exclusive access to a divided resource | |
JP2007148739A (ja) | ファイル管理システム及びそのプログラム | |
US20060136438A1 (en) | Process server array for processing documents and document components and a method related thereto | |
US20090006942A1 (en) | Embedded markup resources |
Legal Events
Date | Code | Title | Description |
---|---|---|---|
C06 | Publication | ||
PB01 | Publication | ||
C10 | Entry into substantive examination | ||
SE01 | Entry into force of request for substantive examination | ||
C14 | Grant of patent or utility model | ||
GR01 | Patent grant | ||
ASS | Succession or assignment of patent right |
Owner name: IBM (CHINA) CO., LTD. Free format text: FORMER OWNER: INTERNATIONAL BUSINESS MACHINES CORP. Effective date: 20101101 |
|
C41 | Transfer of patent application or patent right or utility model | ||
COR | Change of bibliographic data |
Free format text: CORRECT: ADDRESS; FROM: NEW YORK, UNITED STATES TO: 201203 7/F, BUILDING 10, ZHANGJIANG INNOVATION PARK, NO.399, KEYUAN ROAD, HIGH-TECH PARK, ZHANGJIANG, PUDONG NEW DISTRICT, SHANGHAI |
|
TR01 | Transfer of patent right |
Effective date of registration: 20101101 Address after: 201203 Shanghai city Pudong New Area Keyuan Road No. 399 Zhang Jiang Zhang Jiang high tech Park Innovation Park 10 Building 7 layer Patentee after: International Business Machines (China) Co., Ltd. Address before: American New York Patentee before: International Business Machines Corp. |
|
CF01 | Termination of patent right due to non-payment of annual fee |
Granted publication date: 20090114 Termination date: 20171111 |
|
CF01 | Termination of patent right due to non-payment of annual fee |