Cool! Thanks, Hal. That was almost too easy. ;-) -- Martin Cooper
On Tue, 28 Dec 2004 19:08:23 -0500, Deadman, Hal <[EMAIL PROTECTED]> wrote: > You could do this, without the --dry-run option and with the appropriate > committer urls. > > svn checkout > http://svn.apache.org/repos/asf/struts/el/branches/STRUTS_1_2_BRANCH/ > struts-el > > cd struts-el > > svn merge -r106044:123473 --dry-run > http://svn.apache.org/repos/asf/struts/el/trunk > > svn diff > > svn commit > > > > -----Original Message----- > > From: Deadman, Hal [mailto:[EMAIL PROTECTED] > > Sent: Tuesday, December 28, 2004 6:49 PM > > To: Struts Developers List > > Subject: RE: Porting changes to the 1.2.x branch > > > > Would you use svn merge on the directories you changed? > > > > http://copenhagen.pm.org/presentations/subversion/subversion.htm > > See slide "Tags and branches" > > > > or > > http://deadbeast.net/~branden/svn_pres/merging_and_resolving.html > > > > or > > http://svnbook.red-bean.com/en/1.0/re16.html > > > > > > > -----Original Message----- > > > From: Don Brown [mailto:[EMAIL PROTECTED] > > > Sent: Tuesday, December 28, 2004 6:34 PM > > > To: Struts Developers List > > > Subject: Re: Porting changes to the 1.2.x branch > > > > > > Martin Cooper wrote: > > > > I just made a giant commit to the EL taglibs to bring them into > > > > alignment with the non-EL tags. Now these changes need to be > ported > > to > > > > the 1.2.x branch, since the omission of these changes was, in > part, > > the > > > > reason for classifying 1.2.6 as Beta rather than GA, and we'll > want > > to > > > > get to another GA release on that branch at some point, probably > > sooner > > > > rather than later. > > > > > > > > So now that we're in SVN-land, what is the simplest way of taking > > the > > > > changes in one commit and applying them to another branch? > > > > > > Dunno, perhaps you could get a diff between the two versions then > > apply > > > the patch to the other branch. > > > > > > Don > > > > > > > > > > > -- > > > > Martin Cooper > > > > > > > > > > --------------------------------------------------------------------- > > > > To unsubscribe, e-mail: [EMAIL PROTECTED] > > > > For additional commands, e-mail: [EMAIL PROTECTED] > > > > > > > > > > > > > > --------------------------------------------------------------------- > > > To unsubscribe, e-mail: [EMAIL PROTECTED] > > > For additional commands, e-mail: [EMAIL PROTECTED] > > > > > > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: [EMAIL PROTECTED] > > For additional commands, e-mail: [EMAIL PROTECTED] > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
