You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Michael Wood <mw...@its.uct.ac.za> on 2003/10/02 14:25:48 UTC
[PATCH] normalize-dump.py broke at rev 6877
normalize-dump.py is useful for comparing old dump files with
newer ones. It's currently broken, probably because of rev
6877. Also, it does not remove leading slashes from paths, so
normalized dumps created using versions of svnadmin before r6877
have spurious diffs when compared with normalized dumps created
using newer versions of svnadmin.
Here's a patch for the first problem.
* tools/dev/normalize-dump.py
(header_re): Headers don't always contain something after the
colon. (Probably since rev 6877)
(rev_re, header_re): Remove unused variables.
Index: tools/dev/normalize-dump.py
===================================================================
--- tools/dev/normalize-dump.py (revision 7270)
+++ tools/dev/normalize-dump.py (working copy)
@@ -4,9 +4,7 @@
import re
import string
-header_re = re.compile(r'^(.*): (.*)$')
-rev_re = re.compile(r'^Revision-number: (.*)')
-node_re = re.compile(r'^Node-path: (.*)')
+header_re = re.compile(r'^(.*): ?(.*)$')
class NodePath:
def __init__(self, path, headers):
--
Michael Wood <mw...@its.uct.ac.za>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] normalize-dump.py broke at rev 6877
Posted by Michael Wood <mw...@its.uct.ac.za>.
On Thu, Oct 02, 2003 at 09:59:44AM -0500, C. Michael Pilato wrote:
> Michael Wood <mw...@its.uct.ac.za> writes:
>
> > normalize-dump.py is useful for comparing old dump files with
> > newer ones. It's currently broken, probably because of rev
> > 6877. Also, it does not remove leading slashes from paths, so
> > normalized dumps created using versions of svnadmin before r6877
> > have spurious diffs when compared with normalized dumps created
> > using newer versions of svnadmin.
>
> Committed in revision 7274. And then I fixed the log message...
Thanks.
> > * tools/dev/normalize-dump.py
> > (header_re): Headers don't always contain something after the
> > colon. (Probably since rev 6877)
> > (rev_re, header_re): Remove unused variables.
>
> ... because this ^^^^ should have been "node_re". :-)
Oops! Sorry :)
--
Michael Wood <mw...@its.uct.ac.za>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] normalize-dump.py broke at rev 6877
Posted by "C. Michael Pilato" <cm...@collab.net>.
Michael Wood <mw...@its.uct.ac.za> writes:
> normalize-dump.py is useful for comparing old dump files with
> newer ones. It's currently broken, probably because of rev
> 6877. Also, it does not remove leading slashes from paths, so
> normalized dumps created using versions of svnadmin before r6877
> have spurious diffs when compared with normalized dumps created
> using newer versions of svnadmin.
Committed in revision 7274. And then I fixed the log message...
> * tools/dev/normalize-dump.py
> (header_re): Headers don't always contain something after the
> colon. (Probably since rev 6877)
> (rev_re, header_re): Remove unused variables.
... because this ^^^^ should have been "node_re". :-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org