Preserve my changes when update

aroma

Sorry to ask question again...  
I also notice the latest ML version Rev shown at the bottom of this page is 85, but mine is still Rev.67.
I have downloaded TortoiseSVN and followed the instructions closely.
Did I miss out any step?

I found the Rev.85 finally but I have done some setting on the older version already.
If I upload the newest version unto my server, will it overwrite my previous setting?
How can I preserve my setting and yet keep the version updated?

vot

It seems you use a wrong tool...
x2.5ML require the TortoiseHG as a client!

The latest revision is not 85 but 93.
(Yet not uploaded to this site)

If I upload the newest version unto my server, will it overwrite my previous setting?
How can I preserve my setting and yet keep the version updated?

The best solution:
Use TortoiseHG for PULL the repo updates & MERGE new code with your changes.
TortoiseHG will do it automatically.

Not good but still working ok solution:
1) Download/update the latest revision into separated folder.
2) Use WInMerge for compare your real folder with the copied from the repo folder.
3) Search for differences
4) Modify YOUR version corresponding to the repo changes.

aroma

Thanks Vot for this timely reply.

Since my original files are downloaded via SVN, can I just move the old files to a HG folder and then"PULL the repo updates & MERGE new code with" the latest changes ?

aroma

vot replied at 2013-1-31 08:51
It seems you use a wrong tool...
x2.5ML require the TortoiseHG as a client!

Dear Vot,

After messing around, I decided to create a new HG folder and download the newer version available on https://code.google.com/p/discuzx25/

But I think the real issue is I have no idea how to merge the changes with the files installed on my server even if I manage to get the updates from the repository

Can you kindly enlighten me?

vot

Use diff, windiff, Winmerge for find modified files.
Use WinMerge or Tortoise Visual Diff or any equivalent tool for merge changes.

The idea:
Your working folder can be a local HG/Git repository!
And you can use TortoiseHG for merge your local changes with the changes in your HG clone of our repo.

aroma

vot replied at 2013-1-31 11:30
Use diff, windiff, Winmerge for find modified files.
Use WinMerge or Tortoise Visual Diff or any equ ...

Thanks for your tips, Vot.

After merging the modified files, I just need to zip and upload it again to the server hosting the website?

vot

After merging the modified files, I just need to zip and upload it again to the server hosting the website?

Yes, of course.
And clean the cache!

aroma

vot replied at 2013-1-31 12:43
Yes, of course.
And clean the cache!

Really appreciate your advice