> It may be easier to blame the tool but SVN just does what you tell it, > there is no automatic branch merging. SVN is little more advanced than > CVS in this regard; it relies on some external mechanism (e.g. human > beans) to remember the merge points. > > What went wrong here?
ok, we had trunk and a branch and wanted to merge the changes back into trunk. I basically followed these instructions http://www.bricolage.cc/docs/current/api/Bric/Hacker.html#MERGING_CHANGES_FROM_BRANCH_TO_TRUNK resolved all conflicts and committed. the end result was apparently that some changes in trunk were not carried over. now, I'll accept the blame for this if it was my fault and I resolved the conflicts improperly, but I did a lot of inspection on the few conflicts that occured and made sure things were in order (or so I thought). it's not like I resolved the conflict by just saying the branch is right and trunk is wrong, is all I mean. I created tags on trunk before and after the merger, so I guess the really, really motiviated people can attempt the merge again to see what went wrong. --Geoff --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
