[prev] [thread] [next] [lurker] [Date index for 2007/01/30]
I was just beginning to hate SVN, because it thinks I'm the one who
should make the bookkeeping for the merges (gee, I really wonder why
I use a computer...), when I found a tool to help me: svnmerge.py.
A quick look at the manual^Wwiki, and I'm ready to roll:
$ svnmerge init -v -v
svn propget --strict "svnmerge-integrated" "."
svnmerge: calculate head path for the branch
svn info "."
Traceback (most recent call last):
File "/usr/bin/svnmerge", line 1946, in ?
main(sys.argv[1:])
File "/usr/bin/svnmerge", line 1886, in main
cf_head, cf_rev =3D get_copyfrom(branch_dir)
File "/usr/bin/svnmerge", line 764, in get_copyfrom
repos_path =3D target_to_repos_relative_path(dir)
File "/usr/bin/svnmerge", line 754, in target_to_repos_relative_pat=
h
root =3D get_repo_root(target)
File "/usr/bin/svnmerge", line 726, in get_repo_root
url =3D target_to_url(dir)
File "/usr/bin/svnmerge", line 714, in target_to_url
return info["URL"]
KeyError: 'URL'
Oh well, that's a nice error message. I take a hard look at the pile of
puke at the bottom of my screen (I'm a Perl programmer, I don't want to
look at your source code), read the output of svnmerge help int, change
a few commands, try again, only to get some more puke, of a slightly
different shade.
Does svnmerge hate me because I'm French, or what?
Well, I guess I'll have to look at the source, then...
So, I try the command it uses, to find out what it does:
Chemin : .
URL : svn://svn.mongueurs.net/act/branches/stable
Racine du d=E9p=F4t : svn://svn.mongueurs.net/act
UUID du d=E9p=F4t : 67b57a05-4208-db11-a765-00306e02d86a
R=E9vision : 1036
Type de noeud : r=E9pertoire
T=E2che programm=E9e : normale
Auteur de la derni=E8re modification : book
R=E9vision de la derni=E8re modification : 1036
Date de la derni=E8re modification: 2007-01-30 13:14:10 +0100 (mar, 3=
0 jan 2007)
What was the code reading that, already?
key, value =3D L.split(": ", 1)
Mmm. And what is the failing command?
return info["URL"]
Oh yeah. Poor thing, looking for the "URL" key, when it's actually named
"URL ". So it *really* hates me because I'm French.
$ LC_ALL=3DC svnmerge init
property 'svnmerge-integrated' set on '.'
I guess I just have to forward my hate to the svnmerge.py developers.
--=20
Philippe "BooK" Bruhat
A little work with your brain can save you a lot of work with your body.
(Moral from Groo The Wanderer #40 (Ep=
ic))
Generated at 21:02 on 31 Jan 2007 by mariachi 0.52