| |
| | |

CodersClub

 Forgot password?
 Register
Search
View: 4403|Reply: 7
Collapse the left

Preserve my changes when update

[Copy link]

 Singapore

Post time: 2013-01-31 03:41
| Show all posts |Read mode
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?

 Russia

Post time: 2013-01-31 07:51
| Show all posts
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.

 Singapore

 Author| Post time: 2013-01-31 08:10
| Show all posts
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 ?

 Singapore

 Author| Post time: 2013-01-31 09:21
| Show all posts
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?


 Russia

Post time: 2013-01-31 10:30
| Show all posts
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.

 Singapore

 Author| Post time: 2013-01-31 11:07
| Show all posts
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?



 Russia

Post time: 2013-01-31 11:43
| Show all posts
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!

 Singapore

 Author| Post time: 2013-01-31 15:15
| Show all posts
vot replied at 2013-1-31 12:43
Yes, of course.
And clean the cache!

Really appreciate your advice
You have to log in before you can reply Login | Register

Points Rules

Archive|Mobile|Dark room|CodersClub

Top.Mail.Ru
Top.Mail.Ru

2024-11-05 09:55 GMT+3 , Processed in 0.074314 sec., 8 queries .

Powered by Discuz! X3.4 Release 20230520

© 2001-2024 Discuz! Team.

MultiLingual version, Rev. 4301, © codersclub.org

Quick Reply To Top Return to the list