[Svnmerge] svnmerge problems

Giovanni Bajo rasky at develer.com
Wed Nov 9 17:21:32 PST 2005


Florian Klaempfl <florian at freepascal.org> wrote:

> florian at idefix:~/fpcdocs/branches/fixes_2_0> svnmerge merge -r 30-38
> -f c.txt
> Traceback (most recent call last):
>   File "/usr/local/bin/svnmerge", line 1309, in ?
>     main(sys.argv[1:])
>   File "/usr/local/bin/svnmerge", line 1304, in main
>     cmd(branch_dir, branch_props)
>   File "/usr/local/bin/svnmerge", line 920, in __call__
>     return self.func(*args, **kwargs)
>   File "/usr/local/bin/svnmerge", line 727, in action_merge
>     check_dir_clean(branch_dir)
>   File "/usr/local/bin/svnmerge", line 241, in check_dir_clean
>     if launchsvn("status -q %s" % dir)[0]:
> IndexError: list index out of range
> florian at idefix:~/fpcdocs/branches/fixes_2_0> svnmerge -V
> svnmerge r200
>   modified: 2005-11-08 00:19:47 +0100 (Tue, 08 Nov 2005)
>
> Copyright (C) 2004,2005 Awarix Inc.
> Copyright (C) 2005, Giovanni Bajo
>
> Anybody a clue?

Ah sorry. I screwed up, fixed it the second after but forgot to commit the fix
:(

It's done now, fixed in r201.

Giovanni Bajo




More information about the Svnmerge mailing list