Use CC Compare1.12 to quickly synchronize a large amount of text content in a folder

Code comparison and synchronous integration is an essential thing for programmers. Today I will introduce the comparison and integration of a large number of text files under the large folder of CCompare.

When comparing branches, there are more than 2,000 folders in the old and new directories, and more than 30,000 files below, which need to be compared and synchronized. There are intermediate compilation files of vs and svn in the middle. How to quickly compare and find the files that really need to be merged? Avoid wasting time on files with otherwise identical text.

Download address: CCompare download address icon-default.png?t=M3C8http://www.itdp.cn/

1) Open the folder synchronization function of ccompare, and click the rule button.

2) Set the following rules in the rules:

2.1) Select Deep Diff File Text Mode. This mode checks the old and new text one by one for differences. This ruled out the case where files are considered different just because their time and size are slightly different. This mode will find the text really different.

2.2) Tick the skip directory. Fill in the directories that need to be skipped below. For example, vs svn debug release is an intermediate directory between vs tool and svn tool. These directories often do not need to submit code, so ignore these directories to speed up the comparison process. More importantly: avoid these unnecessary files from interfering with the comparison line of sight .

2.3) Tick the skip file type. We know that some files are intermediate files, such as xxx.sln, xxx.vcproj, xxx.vcproj.user, these are project files of vs, and do not need to be submitted, so add the file suffixes that need to be skipped here , to further speed up the comparison process and avoid disturbing the synchronous line of sight.

2.4) Check the file prefix. Take the author as an example, the author develops the program under QT, and QT will automatically generate a large number of intermediate files starting with the prefix ui_. There are a large number of these files. Fill in the prefix of the skipped file here, for example, fill in ui_:UI_, then all files starting with ui_ or UI_ will be ignored during comparison, which can greatly eliminate the interference of comparison.

After clicking OK, the configuration will be saved to disk.

Afterwards, for folder comparison, the files of the above rules will be ignored.

In the in-depth comparison file text mode, the time is a little longer, but the files with different real text can be found.

Guess you like

Origin blog.csdn.net/peterbig/article/details/124188405