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

RE: Merging to a non-existent target?

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-09-22 20:44:12 CEST

> -----Original Message-----
> From: Andy Dingley [mailto:andy.dingley@talgentra.com]
> Sent: Friday, September 22, 2006 10:39 AM
> To: users@subversion.tigris.org
> Subject: Merging to a non-existent target?
>
>
> The second merge is what's causing the problem. The things
> being merged
> in ( typically "<customername>-<taskname>.sql" ) simply don't exist in
> the core. I can do the "merge" easily enough with an SVN
> export and SVN
> add, but this doesn't preserve the SVN log. Every "added"
> customisation
> is seen as appearing anew, and my release notes treat it as
> such. This
> is great for the first build, but for later builds I really do need to
> have SVN log show the SVN history of the customisation, as it
> existed in
> the Implementation team's SVN directory.
>
> I can't "merge" because my target doesn't have a matching
> entity in it.
> If I export (as I currently do), then I lose the log history. Is there
> any way to do a merge like this? I've been trying obvious
> ideas but it
> seems that anything involving "export" or "add" loses the
> connection to
> the past history.
>

"svn copy" will preserve history.

> I can't "merge" because my target doesn't have a matching
> entity in it.

A merge requires two passes. One to merge the directory (add/remove
file objects,) and a second to merge the actual contents of the files in
the directory.

You can add files by merging sub-directories.
- svn co svn://.../.../regular_code_base/a/b/c/db_scripts
- cd db_scripts
- svn merge -r X:Y svn://.../.../customerAlpha/sql_scripts

*****

The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA621

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 22 20:46:37 2006

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