Well, you're actually only making the change in one file, just in two different places in the history coordinate system. ;) If you had two files that needed the same edit, then you could do it with one commit, but because it's the same file existing in multiple "places", you have to use two commits. Note that in any case, the tags (you could use revision numbers as well, if you wanted), will isolate the merge from any other changes that have occurred in either the trunk or the branch, so you needn't worry about that.
In reality, Subversion would let you cheat slightly, if you want. If you create a mixed-version working directory that contains the file on both the trunk and the branch, you could make the change manually in both files, and then commit them as one transaction. You can do this because branches are copies, nothing more, and should therefore be considered an exploit of an implementation detail, not necessarily a intentionally exposed feature. I wouldn't recommend doing that, since it's a lot less clear what happened compared to explicit "made a change" and then "merged changes" operations. cheers, barneyb On 8/8/05, Damien McKenna <[EMAIL PROTECTED]> wrote: > > -----Original Message----- > > From: Barney Boisvert [mailto:[EMAIL PROTECTED] > > Sent: Sunday, August 07, 2005 6:38 PM > > To: CF-Talk > > Subject: Re: OT: (svn) merging between multiple branches > > > > Nope, you're doing two things, so you have to commit twice. > > Interesting idea. The complexity is that the code in trunk has changed > but the branch has stayed as it was since the branching. I guess I was > really wondering if there was a way to have one file diff (e.g. line 43 > on both has changed the same way) be marked on two separate files > without having to commit two changes, but I now that in the scheme of > things I really shouldn't fuss over it :) > > -- > 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. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Find out how CFTicket can increase your company's customer support efficiency by 100% http://www.houseoffusion.com/banners/view.cfm?bannerid=49 Message: http://www.houseoffusion.com/lists.cfm/link=i:4:214050 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=11502.10531.4 Donations & Support: http://www.houseoffusion.com/tiny.cfm/54
