On Mon, Dec 8, 2008 at 3:11 PM, Paul Lindner <[EMAIL PROTECTED]> wrote:
> Hi, > > I'd appreciate it if we could standardize on subversion 1.5 for merging > changesets between branches. > > This means that one should make changes to trunk first, then merge them > into 1.0.x-incubating Well, assuming it's something that actually should be pulled into the stable branch, of course. My usual criteria for that would be 'bug fixes only', though I'm open to fairly liberal interpretation of 'bug fixes'. > > > Subversion 1.5 maintains the resolved merges. You can see what's already > been merged by executing a command like this: > > arcwelder:1.0.x-incubating plindner$ svn mergeinfo > https://svn.apache.org/repos/asf/incubator/shindig/trunk/ > r724511 > r724513 > r724522 > > To merge a changeset from trunk execute something like this: > > arcwelder:1.0.x-incubating plindner$ svn merge -r724510:724522 > https://svn.apache.org/repos/asf/incubator/shindig/trunk > --- Merging r724511 through r724522 into '.': > U java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java > U > java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java > U > > java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java > U java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java > > > When you checkin try to grab the log messages from the changeset like this: > > $ svn log -r724510:724522 > https://svn.apache.org/repos/asf/incubator/shindig/trunk > > and add the JIRA issues to the commit message. This will insure that the > changes for that branch get propogated to the JIRA page for that issue. > > > Thanks! > > -- > Paul Lindner > [EMAIL PROTECTED] > > > >
