How can I split a branch into the version of the trunk it started in Crucible with?

Question

I am wondering how, using Crucible, I can include diff files containing only the changes made in the branch from the point that I separated from my trunk. Currently, if I include something like change sets, it counts each file in the branches as a new file and therefore shows no differences. Is there any way to do this?

I know that I can go and select each file in order to diff from the version of the branch to the latest version of trunk, but that would be very time consuming for the number of files that I changed, and I would worry that I could forget it. Is there a better way?

Answer 1

Fisheye has a langage SQL query called EyeQL , you can build a query to find all the files modified on the branch

select revisions where modified on branch branch_name group by changeset 

Answer 2

svn help diff , form 3: diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]

You need to establish a connecting line in the latest revision before it forks with the latest version in the branch

Sample on a real branch from a real repo

Branch : http://mayorat.ursinecorner.ru:8088/svn/Hello/branches/Leichtbau-Deutsch/

 >svn log -q -v --stop-on-copy http://mayorat.ursinecorner.ru:8088/svn/Hello/branches/Leichtbau-Deutsch/ ------------------------------------------------------------------------ r28 | lazybadger | 2011-02-22 09:24:04 +0600 (, 22  2011) Changed paths: M /branches/Leichtbau-Deutsch/Hello.de.txt ------------------------------------------------------------------------ r27 | lazybadger | 2011-02-22 09:21:41 +0600 (, 22  2011) Changed paths: A /branches/Leichtbau-Deutsch (from /trunk:26) ------------------------------------------------------------------------ 

"from / trunk: 26" gives the OLD URL [@OLDREV], the highest revision in the branch is NEW-URL [@NEWREV]

svn diff http://mayorat.ursinecorner.ru:8088/svn/Hello/ trunk@26 http://mayorat.ursinecorner.ru:8088/svn/Hello/branches/ Leichtbau-Deutsch@28

need result