Comparing Activity on Branches

[Brad Harper <br...@epsiia.com>]

Hello:

I'm fairly new to Subversion, so apologies in advance if the
answer should be obvious.

We have a /dev branch for day-to-day commits.

At the beginning of a testing cycle, we create a /QA branch to
isolate a release candidate's code from that of daily development.

If a bug is corrected on the /QA branch, it needs to be
synch'ed with /dev so that the error doesn't re-occur in a
later release.

Our QA manager is seeking some sort of assurance that this
synchronization has been performed. How would this information
be gleaned from the repository?

I've looked at 'svn diff' for comparing the two branches, but
I get more info than is practical: the file-by-file differences
for every commit that has occurred on both branches.

Brad

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Comparing Activity on Branches

[Duncan Murdoch <mu...@stats.uwo.ca>]

On 3/15/2007 10:52 AM, Brad Harper wrote:
> Hello:
> 
> I'm fairly new to Subversion, so apologies in advance if the
> answer should be obvious.
> 
> We have a /dev branch for day-to-day commits.
> 
> At the beginning of a testing cycle, we create a /QA branch to
> isolate a release candidate's code from that of daily development.
> 
> If a bug is corrected on the /QA branch, it needs to be
> synch'ed with /dev so that the error doesn't re-occur in a
> later release.
> 
> Our QA manager is seeking some sort of assurance that this
> synchronization has been performed. How would this information
> be gleaned from the repository?

I don't think svn currently provides a way to do this.  Our practice is 
as follows:

  - do the bug fix on the trunk.
  - port it from there to the QA branch, with a log message saying what 
revision just got ported.

This way the log for the QA branch is almost all messages of the form 
"port of r12345 from trunk (fix for PR#21212)".  Manual checking of 
other messages would be feasible.

This doesn't guarantee that bug fixes ever do get ported to the QA 
branch, but presumably you have testing procedures in place that can 
check for that.

We used to follow your practice (fix on the branch, port to the trunk), 
but the strategy above doesn't work nearly as well there:  there are too 
many "other messages" on the trunk.

"Merge tracking" is one of the promised features that will eventually 
come.  In the meantime, the svnmerge.py script may be able to help (but 
I have never used it).

Duncan Murdoch

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org