Nope, you're doing two things, so you have to commit twice. However, only one of the commits (the first one) will be actual changes. The second commit will simply be to make a merge operation permanent. The routine should go something like this:
tag trunk make changes to trunk commit tag trunk switch to branch merge tag1:tag2 into working direcotry commit optional: switch back to trunk It might be possible to do a in-repository merge with Subversion, but I'm not sure. I wouldn't recommend it anyway, since after the merge operation, you'll certainly want to test to ensure you didn't introduce any bugs that didn't exist on the trunk. cheers, barneyb On 8/7/05, Damien McKenna <[EMAIL PROTECTED]> wrote: > I'm using SVN 1.2.x for code management. I've created a branch > (/branches/old/) of my main code tree (/trunk) and have made several > changes to the trunk since then. I've just realized I need to make the > same change to both the branch and trunk and was wondering if anyone > knew whether svn had a trick to handle this more gracefully than > recording two different change sets? Answers on a postcard... Thanks. > > -- > Damien McKenna - Web Developer - [EMAIL PROTECTED] > The Limu Company - http://www.thelimucompany.com/ - 407-804-1014 > #include <stdjoke.h> > -- Barney Boisvert [EMAIL PROTECTED] 360.319.6145 http://www.barneyb.com/ Got Gmail? I have 50 invites. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Logware (www.logware.us): a new and convenient web-based time tracking application. Start tracking and documenting hours spent on a project or with a client with Logware today. Try it for free with a 15 day trial account. http://www.houseoffusion.com/banners/view.cfm?bannerid=67 Message: http://www.houseoffusion.com/lists.cfm/link=i:4:213986 Archives: http://www.houseoffusion.com/cf_lists/threads.cfm/4 Subscription: http://www.houseoffusion.com/lists.cfm/link=s:4 Unsubscribe: http://www.houseoffusion.com/cf_lists/unsubscribe.cfm?user=89.70.4 Donations & Support: http://www.houseoffusion.com/tiny.cfm/54
