using git / svn and dealing with version no

[ub.ch]

Heya!

we are (still) using svn to manage our vbulletin instance.
So far so good and all works well, but the main pain in the a•• is the upgrading process!
SVN marks _all_ new files as conflicted, just because they have a different version number

PHP Code:

|[-]| # vBulletin 4.1.5 Patch Level 1 - Licence Number V**
|[+]| # vBulletin 4.2.1 - Licence Number V** 


How do you handle this?
We are planning on moving to git; but as far as I can see, the problem is still the same.
I just don't want to go through all files and clear the conflicts.

NB: some "core" files have been modified by us, I do know which ones, but the whole point of a versioning system is to know have to deal with those

Or am I doing the update process wrong then you or what is best practice?

Best

[Dave]

Well since there's no way (as far as I know) to ignore comments in SVN/git commits, your only option would be to use something like WinMerge and compare the old and new folder. In WinMerge you can create a filter to ignore all comments when it checks for differences. I've done this before and it's quite easy.

http://stackoverflow.com/questions/3...gnore-comments

[squidsk]

Originally Posted by ub.ch

Heya!

we are (still) using svn to manage our vbulletin instance.
So far so good and all works well, but the main pain in the a•• is the upgrading process!
SVN marks _all_ new files as conflicted, just because they have a different version number

PHP Code:

|[-]| # vBulletin 4.1.5 Patch Level 1 - Licence Number V**
|[+]| # vBulletin 4.2.1 - Licence Number V** 


How do you handle this?
We are planning on moving to git; but as far as I can see, the problem is still the same.
I just don't want to go through all files and clear the conflicts.

NB: some "core" files have been modified by us, I do know which ones, but the whole point of a versioning system is to know have to deal with those

Or am I doing the update process wrong then you or what is best practice?

Best

Depending on how you've got things setup it should pick it up automatically and ignore them. Git rebase, whether from master to a branch or origin to master, will only flag a change if both you and vbulletin have changes the same line of code. Svn merge works the same way. I am in the process of writing an article on how to exactly this but it's been gathering dust unfortunately. The only way you should be getting the behaviour your describing is if you only have a single path of commits.

[ub.ch]

Originally Posted by Dave

Well since there's no way (as far as I know) to ignore comments in SVN/git commits, your only option would be to use something like WinMerge and compare the old and new folder. In WinMerge you can create a filter to ignore all comments when it checks for differences. I've done this before and it's quite easy.

http://stackoverflow.com/questions/3...gnore-comments

Im am using a Mac

There is a possibility to ignore some lines in git, but before I use this method, I thought I just ask
http://stackoverflow.com/questions/1...cific-lines-of

Depending on how you've got things setup it should pick it up automatically and ignore them

can you give more detail? Because for me it does not work

[squidsk]

Originally Posted by ub.ch

can you give more detail? Because for me it does not work

You need to setup two git repositories, though in theory it should work with 2 branches in the same repository. One repository/branch is solely for committing changes to vBulletin (i.e. upgrades) the other repository/branch is where your customizations are committed. When you apply an upgrade to the first repository/branch you then fetch it to the second and apply a git rebase to have your customization applied to the new "base" code.

I finished the article and have submitted it for approval with staff.

--------------- Added [DATE]1453494919[/DATE] at [TIME]1453494919[/TIME] ---------------

If you wanted to continue using svn you could do a similar thing where the vbulletin commits are on the trunk line and your changes are on a branch. Every time you commit a new vbulletin version to the trunk do an svn merge to your branch to upgrade you customizations to the new versions of svn.

[ub.ch]

Awesome!!
Thank you!!

I will wait for the article and hopefully things will clear up

[squidsk]

It was approved yesterday and isinthe vb tips and tricks section of the articles area.