On 20 Sep., 13:29, Kiril Angov <[EMAIL PROTECTED]> wrote: > Matthias N. wrote: > > On 20 Sep., 12:25, Kiril Angov <[EMAIL PROTECTED]> wrote: > > >> Matthias N. wrote: > > >>> Hi devs, > > >>> in the past I had ugly problems with merging two svn directories: > >>> trunk and branches/mahono. > > >>> I tried it by hand and with kdiff3.. but unfortunately this is just a > >>> pain.. > > >>> What is the best way to merge these dirs on a Debian/KDE machine? :-) > > >>> Do I have to checkout the whole repository to let subversion do the > >>> merge? Or is there a simpler way? > > >>> Any help is really appreciated as I would like to finally polish my > >>> suggestions for a change in the controller. > > >>> Regards, > >>> Matthias > > >> Matthias, > > >> When keeping a branch from an actively changing trunk/ you should merge > >> the changes from trunk into your branch very often in order to avoid one > >> big mess when trying to get the latest changes from trunk. In short: > > >> cd /your/banch/checkout > >> svn merge -r 4634:HEADhttp://svn.symfony-project.com/trunk. > > > Thank you! > > Why did you try this revision? Can't I use the revision of the latest > > change of my branch: 4774? > > Trying the command with --dry-run I get some "missing target" errors. > > How can I solve them? > > >> I just tried that and it gives many conflicts and also it seems like > >> revision 4634 is not the oldest revision you have not merged from trunk > >> into your branch. I tried to look at the svn logs to see when was the > >> last time you merged from trunk/ but I guess you were not merging the > >> whole trunk/ but just parts of it (like libs/). If I understood right, > >> you want to merge the latest changes from trunk/ into your branch, > >> right? If that's the case, look at the above command and figure out the > >> right start revision and maybe in your case you need to do several merges. > > > Yeah, I want to update my branch to current trunk. > > You mean I have to find the first revision after my last merge that > > works without "missing target" errors? > > > Regards, > > Matthias > > You kind of did a mistake when you were merging from trunk/ into your > branch and was merging only certain directories but not the whole tree. > The missing targets are some test files which were added before revision > 4634 (and are not present you your branch) and then were changed in > revisions after 4634. You cannot use the latest revision your branch was > changed because it is not when you last merged from trunk/ > > http://trac.symfony-project.com/trac/log/branches/mahono?action=stop_... > > I tried to run a merge command from revision 4591 when was your latest > full merge from trunk/ but I still get the missing targets and it does > not merge cleanly. Without knowing how you merged from trunk until now, > I really do not know what to advise you. > > Kupo
Like I said: I did these merges by hand as I didn't get the right command / options to work.. Hm.. maybe I should remove the branch and copy it from trunk once again (not sure if I have the svn permission to do that) and continue with a clean branch!? I'm afraid this is the easiest way.. Regards, Matthias --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "symfony developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/symfony-devs?hl=en -~----------~----~----~----~------~----~------~--~---
