Hello,
I've upgraded to the latest version of svnmerge.py (revision 29835), but
that version does not work in our script. Revision 28275 did and does work.
We call svnmerge.py as follows:
svnmerge.py merge -r1:14633 -f commit-svnmerge-62v1-pii81.txt
D:\work\data\dev\merge_pii81 -S
https://mip.sc-phlps.sfo.collab.net/svn/mip/branches/62v1
The error output we get is this:
----------Error Output----------
Traceback (most recent call last):
File "D:\work\data\community-tools\svnmerge\svnmerge.py", line 2160, in ?
main(sys.argv[1:])
File "D:\work\data\community-tools\svnmerge\svnmerge.py", line 2155, in
main
cmd(branch_dir, branch_props)
File "D:\work\data\community-tools\svnmerge\svnmerge.py", line 1642, in
__call__
return self.func(*args, **kwargs)
File "D:\work\data\community-tools\svnmerge\svnmerge.py", line 1391, in
action_merge
print >>f, construct_merged_log_message(opts["source-url"], revs),
File "D:\work\data\community-tools\svnmerge\svnmerge.py", line 964, in
construct_merged_log_message
message = get_commit_log(url, r)
File "D:\work\data\community-tools\svnmerge\svnmerge.py", line 950, in
get_commit_log
return recode_stdout_to_file("".join(out[1:]))
File "D:\work\data\community-tools\svnmerge\svnmerge.py", line 222, in
recode_stdout_to_file
u = s.decode(sys.stdout.encoding)
TypeError: decode() argument 1 must be string, not None
----------Standard Output----------
property 'svnmerge-integrated' set on 'D:\work\data\dev\merge_pii81'
property 'svnmerge-blocked' deleted from 'D:\work\data\dev\merge_pii81'.
U
D:\work\data\dev\merge_pii81\software\PMX\Philips\PmsMip\Private\Services\FSF\Server\Resources\MenuTree\SystemFnMenuTreeData.xml
U
D:\work\data\dev\merge_pii81\software\PMX\Philips\PmsMip\Private\Services\FSF\Server\Resources\UIDefinitions.resx
U
D:\work\data\dev\merge_pii81\software\PMX\Philips\PmsMip\Private\Services\FSF\Server\Resources\MenuTree.resx
U
D:\work\data\dev\merge_pii81\software\PMX\Philips\PmsMip\Private\Services\FSF\Server\Resources\UIDefinitions\ServiceOrgIDUIDefinition.xml
C
D:\work\data\dev\merge_pii81\software\PMX\Philips\PmsMip\Private\Services\FSF\Server\SessionManager\Session\SessionGetDataUtil.cs
U
D:\work\data\dev\merge_pii81\software\PMX\Philips\PmsMip\Private\Services\FSF\Client\Components\Actions\Constants.cs
C
D:\work\data\dev\merge_pii81\software\PMX\Philips\PmsMip\Private\Services\FSF\Client\Components\Actions\FlowPanelAction\FlowPanelAction.cs
U
D:\work\data\dev\merge_pii81\software\PMX\Philips\PmsMip\Private\Services\FSF\Client\Components\Actions\ServiceOrgIDAction.cs
Skipped missing target:
'D:\work\data\dev\merge_pii81\software\PMX\Philips\PmsMip\Private\Viewing\DataSelection\VolumeDataSelection.cs'
Skipped missing target:
'D:\work\data\dev\merge_pii81\software\PMX\Philips\PmsMip\Private\Viewing\Display\Basic\Platform\D3d\D3dDevice.cs'
Skipped missing target:
'D:\work\data\dev\merge_pii81\software\PMX\Philips\PmsMip\Private\Viewing\Display\Basic\Platform\D3d'
property 'svnmerge-integrated' set on 'D:\work\data\dev\merge_pii81'
property 'svnmerge-blocked' set on 'D:\work\data\dev\merge_pii81'
----------The End----------
Could you please tell me what the problem is?
Regards,
Piet-Hein Peeters
Software Configuration Manager
----------------------------------------------------------------------------
Philips Healthcare - Healthcare Informatics / PII
Room QV-136, P.O. Box 10.000, NL - 5680 DA Best
Phone +31 40 27 62016
----------------------------------------------------------------------------_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge
