I actually didn't change anything in the cake core, just that I have these SVN properties for keyword substitution, which I (stupidly) added to the cake files. So, SVN is doing it's substitution magic on the cake core file with my parameters, and that is causing differences/ conflicts which shouldn't be there. Need to remove them.
I also think I don't have svn setup just quite right, but don't really know what is wrong. When I get more experience with it, I'll probably trash the current installation, and install again from scratch with things setup in the proper way. Will lose some history, but will be better off going forward. Anyways, are you saying you do not put cakephp into SVN as a separare "vendor", and you don't do vendor branching? How do you handle cake upgrades? Do just replace the latest cake core folder with each project and recommit? On Jul 4, 6:22 pm, aranworld <[EMAIL PROTECTED]> wrote: > I will second what AD7six says. For a while I tried out this type of > merging. I soon realized that it is much easier to just leave the > Cake core alone. I just have a shared cake folder for all my projects > that I do an SVN update on. > > One advantage of this is that if you start submitting patches to trac > you can be sure they are based off the current code. > > On Jul 3, 1:54 pm, AD7six <[EMAIL PROTECTED]> wrote: > > > On Jul 3, 10:48 pm, keymaster <[EMAIL PROTECTED]> wrote: > > > > Thanks Samuel and the_woodsman, > > > > I went through the svn book chapter (wish that section would have come > > > up in my prior google searches...). > > > > Yup, those markings are internal svn conflict markers enabling it to > > > determine your old stuff from the stuff you are merging against. > > > > SVN will cause you trouble until you instruct it how to resolve the > > > conflict, or order it to forget about the conflct because you've > > > resolved it manually. > > > > Merging for the first time is not simple, at least until you get the > > > hang of it. > > > > For those that read this thread afterwards, you need to know three > > > things: > > > > 1. Merging against revision range M to N requires you tell subversion > > > to use (M-1) to N. > > > > 2. You MUST either use SVN to resolve a conflict, or inform svn after > > > you've resolved the conflict yourself. It needs to know in order to > > > clean up all it's conflict markers from the merge. > > > > 3. You need to learn the Svn conflict resolution tools both at the > > > file and line level, to do this properly. > > > Or avoid ever hack your cake install - no risk of conflicts then. --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "CakePHP" group. To post to this group, send email to cake-php@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/cake-php?hl=en -~----------~----~----~----~------~----~------~--~---
