Have fun. We found that if you rename packages in the branch, or move files between packges, it is impossible to merge back into the trunk. There is no history in svn for directories. So, you have full history for the file, but there is no way to relate the new file(incl path) to the old file (incl path).
I may be oversimplifying the reason or description of the problem but we found that we could rename files in the branch and merge. But if we renamed a package or moved the file to another package we could not merge. Geoff On 12/8/05, Howard Lewis Ship <[EMAIL PROTECTED]> wrote: > ... but I'm working in my own branch. We'll really be testing SVN's > ability to deal with moves and renames when I merge these changes back > into the trunk. > > -- > Howard M. Lewis Ship > Independent J2EE / Open-Source Java Consultant > Creator, Jakarta Tapestry > Creator, Jakarta HiveMind > > Professional Tapestry training, mentoring, support > and project work. http://howardlewisship.com > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > -- The Spindle guy. http://spindle.sf.net Get help with Spindle: http://lists.sourceforge.net/mailman/listinfo/spindle-user Announcement Feed: http://www.jroller.com/rss/glongman?catname=/Announcements Feature Updates: http://spindle.sf.net/updates --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
