[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: merge to identical file

From: Srilakshmanan, Lakshman <lakshman.srilakshmanan_at_police.vic.gov.au>
Date: Thu, 24 Apr 2008 10:45:47 +1000

Hi Mathijs,

When merging from branch into trunk ensure you use the branch URL and
trunk URL to determine the merge set.

For example.
svn co http://hostname/project1/trunk projetc1-trunk
cd projetc1-trunk
svn merge http://hostname/project1/branch/xyz
http://hostname/project1/trunk

Comparing http://hostname/project1/branch/xyz to
http://hostname/project1/trunk will select ONLY the changes made in
branch xyz.

It will NOT include the changes received from trunk and will exclude
identical files.

Thanks
Lakshman
-----Original Message-----
From: mathijs.romans_at_gmail.com [mailto:mathijs.romans_at_gmail.com] On
Behalf Of Mathijs Romans
Sent: Monday, 21 April 2008 5:23 PM
To: users_at_subversion.tigris.org
Subject: merge to identical file

Hi!

we have a typical setup where trunk is our stable version and developing
takes place in several branches. While development in a brach takes
place, the trunk may be updated with other changes. Now suppose we want
to merge one of these development branches back into the trunk, we
prefer to test it before we include it in the trunk. So my idea was to
first update the branch with all changes that have taken place in the
trunk. And if it works, to apply all changes in the branch directly back
into the trunk.

Now of course, in principle I'll be applying the changes in the trunk
twice. In the book Version Control with Subversion, it says:

"When patching a file, Subversion typically notices if the file already
has the change, and does nothing."

Now my question is this: in the case the merge is a diff between
versions A and B, applied to version X, if a file is identical in B and
X, is it guaranteed that the merge does nothing to it in all cases? Or
is "typically" still the right quantifier here? Is it then probably best
to make a "testing" branch to test merged components?

I appreciate your comment.

Kind regards,
Mathijs Romans

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org

================================================================================================
EMAIL DISCLAIMER

This email and any attachments are confidential. They may also be subject to copyright.

If you are not an intended recipient of this email please immediately contact us by replying
to this email and then delete this email.

You must not read, use, copy, retain, forward or disclose this email or any attachment.

We do not accept any liability arising from or in connection with unauthorised use or disclosure
of the information contained in this email or any attachment.

We make reasonable efforts to protect against computer viruses but we do not accept liability
for any liability, loss or damage caused by any computer virus contained in this email.
================================================================================================

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-04-24 02:46:12 CEST

This is an archived mail posted to the Subversion Users mailing list.