Templot logo

Templot Club Archive - Search Results

To search again, click the Back button in your browser.


Search results for: diffing

4 results found.
... While you have been making changes to these units, I have also been making changes to some of them. Which means we now have 3 versions of each file: 1. as currently on SourceForge 2. as modified by you 3. as modified by me Which of us does the merging and conflict resolution? What happens if while one or other of us is doing that, the other makes some further changes -- which may or may not be compatible with the results of the merging? WinMerge allows 3-way diffing, so I have just opened the above 3 versions of keep_select.pas, and there are so many differences that I hardly know where to begin. What seems obvious is that doing this every time any one of a group of programmers changes something in one file, with consequent changes needed in some other file, it is going to take 10 times longer than making the actual change in the first place. How do other groups manage this? cheers for now, Martin. posted: 29 Nov 2019 22:46 from: ...
Terms matched: 1  -  Score: 16  -  170k  -  URL: https://85a.uk/templot/archive/topics/topic_3544.php
... topic: 3287 2 useful programs posted: 14 Jun 2018 00:31 from: Martin Wynne If you are thinking of dabbling in Templot coding, here are a couple of programs (free) which are very useful tools to have. 1. WinMerge download from: http://sourceforge.net/projects/winmerge WinMerge is a diffing tool, which means you can use it to find the differences between two chunks of text, or two text-format files. Just paste the texts into each side of the editor, or load the files. Both sides will scroll in sync. Here Winmerge has found a line in the text on the right which isn't in the text on the left, expanded the text on the left to keep it in sync, and highlighted the difference in yellow: 2_131857_370000000.png 2. Notepad++ download from: http://notepad-plus-plus.org/ Notepad++ is a multi-tabbed programmers editor. It can be set to use Pascal syntax highlighting, and is great for editing, searching and comparing chunks of ...
Terms matched: 1  -  Score: 8  -  12k  -  URL: https://85a.uk/templot/archive/topics/topic_3287.php
... unit file, form file next. Hi, Martin, Thanks for these. It turned out that the documentation for the libraries I found is... er... scant. Sigh. Never mind. These things are sent to try us. I will see what I can do. Cheers, graeme posted: 10 Dec 2019 05:20 from: Martin Wynne Attached below is a zip of a full set of my latest T3 files. I will also put it in the Files section on SF. For diffing and merging I use WinMerge (free) which is great: http://winmerge.org The files include your changes, with a few additional changes from me. It is working fine here. There is a new folder xml_units for the new BGS3 file format. Zip below. cheers, Martin. Attachment: attach_2955_3563_templot_mec_292a _10_12_2019.zip 2 posted: 12 Dec 2019 12:48 from: Martin Wynne Graeme wrote: You will send me changes based on one version of the software and I will apply it to mine, but mine ...
Terms matched: 1  -  Score: 8  -  62k  -  URL: https://85a.uk/templot/archive/topics/topic_3563.php
... While you have been making changes to these units, I have also been making changes to some of them. Which means we now have 3 versions of each file: 1. as currently on SourceForge 2. as modified by you 3. as modified by me Which of us does the merging and conflict resolution? What happens if while one or other of us is doing that, the other makes some further changes -- which may or may not be compatible with the results of the merging? WinMerge allows 3-way diffing, so I have just opened the above 3 versions of keep_select.pas, and there are so many differences that I hardly know where to begin. What seems obvious is that doing this every time any one of a group of programmers changes something in one file, with consequent changes needed in some other file, it is going to take 10 times longer than making the actual change in the first place. How do other groups manage this? We don't currently have an updated set of files on SourceForge with some of the recent ...
Terms matched: 1  -  Score: 8  -  69k  -  URL: https://85a.uk/templot/archive/topics/topic_3564.php


Search took 0.115 seconds


Back to Templot Club