svn log issue with merges

6 views

Skip to first unread message

Chris Lamey

unread,

Jan 30, 2009, 6:03:37 PM1/30/09

to codeswarm

Hey guys,

convert_logs.py was choking on my svn log. It would only grab a small
subset of the revision lines rather than all of them. This is because
the
script doesn't account for svn merges, which follow this format:

------------------------------------------------------------------------
r49343 | dev | 2008-10-03 17:10:02 -0600 (Fri, 03 Oct 2008) | 15 lines
Changed paths:
M /path.xml

[merge] merge -r48629:48810 https://svnserver/subversion/branchname

------------------------------------------------------------------------
r48810 | dev | 2008-09-30 12:40:21 -0600 (Tue, 30 Sep 2008) | 1 line

Comment number one
------------------------------------------------------------------------
r48724 | dev | 2008-09-29 14:56:23 -0600 (Mon, 29 Sep 2008) | 1 line

Comment number two
------------------------------------------------------------------------

That last subversion line makes the script think the file is ended.

So I patched convert_logs.py with the below change to just look for
the
revision line directly. Seems to work ok for me. I'm not sure if
merged
changes get counted twice, or if the path/date/author is used to
detect
duplicates.

clameylt:~/tmp/codeswarm/codeswarm-read-only/convert_logs > cat
convert_logs.diff
92a93
> import re
100c101
< if line.startswith(svn_sep):
---
> if re.search("^r\d*\ ", line):
103c104
< rev_line = file_handle.readline()
---
> rev_line = line

Chris Lamey

unread,

Jan 30, 2009, 6:05:12 PM1/30/09

to codeswarm

Also, I'd like to apologize for the formatting of that email. I had
written it in an email client, but the emails would get bounced. So
used the webform and just cut'n'paste...

On Jan 30, 4:03 pm, Chris Lamey <cla...@gmail.com> wrote:
> Hey guys,
>
> convert_logs.py was choking on my svn log. It would only grab a small
> subset of the revision lines rather than all of them. This is because
> the
> script doesn't account for svn merges, which follow this format:
>
> ------------------------------------------------------------------------
> r49343 | dev | 2008-10-03 17:10:02 -0600 (Fri, 03 Oct 2008) | 15 lines
> Changed paths:
> M /path.xml
>