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

Merge Tracking feed-back svn 1.5 Beta

From: Murli Varadachari <murli_at_yahoo-inc.com>
Date: 2007-05-16 21:59:39 CEST

 

Merge tracking feed-back

 

++++++++++++++++++++++++

 

1:

 

Merge unnecessarily updates the property values of the "target"
directory even if there are no content changes in the "source" branch.
This forces commits even though there is no underlying content change
due to merge.

 

Ex: I am merging from branchA ( revision 1999) to trunk in my local
workspace.

 

       "svn merge URL/projectX/branches/branchA WC/trunk"

 

Merge is successful and I commit my trunk creating a new version say
"2000". A new property "svn-mergeinfo: 1-1999" is added to the trunk
directory.

 

So far so good!

 

Now I repeat the same process again .-the "trunk" directory property
gets updated again with the revision #2000 now added to the property
"svn-mergeinfo" of the trunk. Nothing should change at this point
since I have already merged branchA into trunk - a property change now
forces me to commit a new revision on trunk.

 

Subsequent increments to the repository "revisions" from completely
unrelated commits result in the above merge operation updating the trunk
property over and over again.

 

2:

 

Problems using "cvs2svn" conversion of existing CVS repository [ from a
merge perspective ]

 

Example:

I have converted an existing CVS repository into a SVN repository. This
final svn repository contains no merge information ( as is expected).
Several commits later [ on the new repository] the nightly build script
attempts to merge changes on branchA to trunk [ no revision range
specified ]. This results in a whole range of bizarre merges.

 

I understand this problem can be fixed by using merge ranges. However
the question is can the following functionality be provided either in
"cvs2svn" and / or svn itself.

 

(a) An option in"cvs2svn" which allows all imported revisions from
CVS to be recorded as "already merged."

(b) AND / OR a new "revision property" that prevents the "svn"
merge" from picking up any changes prior to this point for merge
considerations.

 

3:

 

Subversion 1.5 beta does not build on RHEL4 - 64bit O.S [Neon
compilation failure]. It builds fine on RHEL4- 32bit O.S

 

 

Cheers

Murli varadachari

Release - Yahoo Search
Received on Thu May 31 01:25:23 2007

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