How to merge FET files

[ChicagoPianoTuner]

Hi! I was working on my timetable and to help work on a particular part I started a new file and I would like to combine the changes. Here's how it worked:

I started with Timetable_1.fet. I saved into Timetable_2.fet and deleted many activities that I did not want to worry about yet. I also added new activities and, more importantly, many time constraints. I did NOT make any changes to Timetable_1. I would like to re-add the activities that I have deleted. I know merging files is difficult. Can anyone provide any suggestions?

Thanks very much.

[Liviu Lalescu]

It should not be that difficult. Difficulties appear if you have in the two files activities with the same id but which are different. Note that if you kept the last (greatest) id of the activity, FET will only add with id-s greater than this one.

Please open the .fet XML file with a text or XML editor. There are section: "<Activities_List>" and "<Time_Constraints_List>". You might be able to copy/paste from 1 into 2 or from 2 into 1.

You may also use a tool like KDiff3 to compare by contents the two files, to help into deciding.

If you cannot do that, you may send your files to me (privately by email or attach here).

[ChicagoPianoTuner]

Thanks for the quick reply. I have tried to compare the files using MS Word's comparison functions but have had no luck. I will send you an email and maybe you can tell me how to best proceed. Thank you!

[Liviu Lalescu]

You can try with: http://kdiff3.sourceforge.net/ . But I'll wait for your email.

[Zsolt Udvari]

Maybe you want to use a version control system (git, svn, ...).

[Liviu Lalescu]

Maybe you want to use a version control system (git, svn, ...).

Unfortunately, I did not learn these

[ChicagoPianoTuner]

I just wanted to add that with KDiff3 this task was very easy (I did not have overlapping activities). Thank you for the suggestion.