AW: Reintegrate merge to another branch

Hi Giulio,

Thank you for your comments.

From my point of view, the bennefit of reintegrate is that users do not
have to take care about the used revisions, so we would like to use that
functionality for submitting changes to other branches too. For instance
when we have to provide patches to a test-branch before patches are
merged back to trunk.

Best regards,

Andreas Graf

________________________________

Von: Giulio Troccoli [mailto:Giulio.Troccoli_at_uk.linedata.com]
Gesendet: Mittwoch, 30. Juni 2010 14:47
An: Graf, Andreas; users_at_subversion.apache.org
Cc: Bruedern, Ivonne
Betreff: RE: Reintegrate merge to another branch

I don't think is possible to use --reintegrate. You can always to a "old
style" merge with a revision range.

But there is something I don't understand. I presume you have created
both branches from trunk, so after you have reintegrated the first
branch, isn't it ebough to do a merge from trunk in the second branch?

G

 
 
Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1
6DB
Registered in England and Wales No 3027851 VAT Reg No 778499447
 

________________________________

From: Graf, Andreas [mailto:Andreas.Graf_at_ext.eu.panasonic.com]
Sent: 30 June 2010 13:39
To: users_at_subversion.apache.org
Cc: Bruedern, Ivonne
Subject: Reintegrate merge to another branch

Hi SVN folks!

We are using Tortoise reintegrate successfully to merge changes back to
the branch that have been used for branch-off.

But if we are using reintegrate to apply the same differences to another
branch, we are getting bad merge results.

Is there a bug-fix for that problem available or is it only possible to
do that merge using range-merging?

Environment
------------------------------------------------------------------------
-------

Win32-Client

svn, version 1.6.11 (r934486)

   compiled Apr 16 2010, 10:39:09

TortoiseSVN 1.6.8, Build 19260 - 32 Bit , 2010/04/16 20:20:11

Subversion 1.6.11,

apr 1.3.8

apr-utils 1.3.9

neon 0.29.3

OpenSSL 0.9.8k 25 Mar 2009

zlib 1.2.3

Linux Server:

svn, version 1.6.6

------------------------------------------------------------------------
-------------------------

Best Regards,

Andreas Graf

........................................................................
......
Confidentiality Notice
The information contained in this Email, and any attachments, is
intended for the named recipients only. It may contain confidential
and/or legally privileged information. If you are not the intended
recipient, you must not copy, store, distribute or take any action in
reliance on it. Any views expressed do not necessarily reflect the views
of the company.

If you receive this Email by mistake, please advise the sender by using
the reply facility in your Email software and then delete it.
........................................................................
.....

..............................................................................
Confidentiality Notice
The information contained in this Email, and any attachments, is intended for the named recipients only. It may contain confidential and/or legally privileged information. If you are not the intended recipient, you must not copy, store, distribute or take any action in reliance on it. Any views expressed do not necessarily reflect the views of the company.

If you receive this Email by mistake, please advise the sender by using the reply facility in your Email software and then delete it.
.............................................................................
Received on 2010-06-30 15:54:30 CEST