On 13/01/2011 20:08, Ryan Schmidt wrote:
>
> On Jan 13, 2011, at 10:46, Jonathan Oulds wrote:
>
>> consider a project with many branches and tags, now imagine that a bug is discovered to have been introduced at an early stage of the project e.g. revision 100. All branches taken after revision 100 will potentially have the bug all branches taken prior to revision 100 will not.
>
> That's not necessarily true -- a branch taken before revision 100 could still contain the bug, if the revision that caused the bug is later merged into that branch. So I'm not sure your proposal actually helps solve a problem. It sounds like the problem is identifying which branches contain a particular bug, and I'd say you have to test each branch -- check out the branch, build your software, run it, see if it exhibits the problem. Then merge the fix from trunk if it's needed.
>
>
My understanding of svn log is that you can use the -g switch to include
comments from the merge history.
Example:
I take branch A from /trunk at revision 50, later I introduce a bug at
revision 100 of /trunk at revision 200 I merge /trunk into branch A, now
at revision 500 I spot my mistake and amend the log entry for /trunk_at_100.
Now if I do svn log -g branches/A surely I will see the updated log
entry identifying the bug, because the -g switch pulls in the log
entries from the merged revisions including the amended log entry.
Jonathan.
Received on 2011-01-14 10:56:59 CET