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

Checking changes between branches

From: <pkahn_at_connected.com>
Date: 2004-10-13 19:40:49 CEST

Hi, I'm running into a bit of a problem here with SVN and branches. I want
an easy way to determine if all changes have been merged from branch A to
branch B. Near as I can figure it, the best way to do this is to export
each branch to my local machine and then use a tree-diffing tool for
analysis. (or to have a diffing tool that is smart enough to handle binary
files and skip .svn directories)
 
 
I have tried several other methods and all yield false positives or failures
1) remerge
   sync branch A-Original
   sync branch B-OriginalBranchWithModifications
   determine revision range by using the -stop-on-copy arg for log
   merge branch B with range on to A
 
   Problem: for text files I can get some conflicts due to remerging (but
not many)
                  for binary files, I get many conflicts due to remerging
and I must use a diffing tool on each to determine if they are real or false
positives
 
 
2) svn diff URL-for-A URL-for-B
  Problem: client will not diff a binary. It will not even tell me if the
binaries differ (I am using the WebDav)
 
 
 
In both cases, diffing at the end of a project can be a difficult affair.
I'm used to perforce which tracks the diffs between the two branches so the
end-of-project diffing between the branches is a snap.
 
Do you know of any good scripts, tools or practices out there that perform
some of this analysis to make integration between branches more of a snap in
SVN?
I have several scripts, but all seem to suffer from a variety of these
issues.
 
Thanks.

--
Peter Kahn
pkahn@connected.com
 
Received on Wed Oct 13 19:42:35 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.