[infinispan-dev] migrating changes between branches

[Mircea Markus]

BTW, attached is a script I use for svn merge from 42x to trunk. It merges a single revision, needs to be edited before run.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 42x2trunk.sh
Type: application/octet-stream
Size: 692 bytes
Desc: not available
Url : http://lists.jboss.org/pipermail/infinispan-dev/attachments/20100915/e1a3354d/attachment.obj 
-------------- next part --------------

On 15 Sep 2010, at 19:56, Sanne Grinovero wrote:

> 2010/9/15 Mircea Markus <mircea.markus at jboss.com>:
>> Hi,
>> Using svn merge instead of diff-then-apply is better for tracking file
>> revisions, especially when it comes to moving/deleting files etc[1].
>> I think it important to use svn merge at least when files are
>> renamed/moved/deleted - both for a better revision tracking and for merging
>> correctness. Also helps with conflicts.
> 
> Thanks for the clarification, that was indeed puzzling me.
> Cheers,
> Sanne
> 
>> Cheers,
>> Mircea
>> [1] http://gcc.gnu.org/wiki/SvnMerge
>> _______________________________________________
>> infinispan-dev mailing list
>> infinispan-dev at lists.jboss.org
>> https://lists.jboss.org/mailman/listinfo/infinispan-dev
>> 
> 
> _______________________________________________
> infinispan-dev mailing list
> infinispan-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/infinispan-dev