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

Merging to a non-existent target?

From: Andy Dingley <andy.dingley_at_talgentra.com>
Date: 2006-09-22 16:39:00 CEST

I have a large project. Multi-team (Java, DB, Implementation), multi
development trunk, multi-customer. With the aid of embedded Dublin Core
properties, structured SVN comments and Bugzilla IDs, there's also a lot
of release document generation based on querying the SVN repository.

I do an average of one manual build a day. Typically this involves
taking a core product from the Java team, merging in the latest from the
DB team, then merging in customer-specific tweaks from the
Implementation team. It's then tagged and the release notes (list of
changes and related Bugzillas) are generated by diffing the logs from
this tag to the previous tag.

The first merge is easy. The (Java) core product includes old copies of
the DB work, I just have to make sure that they're current. The DB
team's work is in a separate directory of the same repository, so a
simple merge onto the core works fine. I also have full tracking of SVN
logs on the merged items so my release note generator works.

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.

Any advice?

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 22 16:39:53 2006

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