Re: merging from trunk to 1.0.x

[Paul Lindner <pl...@hi5.com>]

On Dec 9, 2008, at 11:40 PM, Ian Boston wrote:

> I am running 2 branches in a local git repo and merging from trunk  
> to the branch.....
> is that going to be ok ?
>
> There are already some commits in the 1.0.x branch done this way...  
> it picks up the commit message from trunk so is tracked in jira.
>
> Ian
> On 8 Dec 2008, at 23:11, Paul Lindner 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
>>
>> 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
>> plindner@hi5.com
>>
>>
>>
>

Paul Lindner
plindner@hi5.com