Re: Playing with svnmover

On Wed, Mar 18, 2015 at 3:15 AM, Johan Corveleyn <jcorvel_at_gmail.com> wrote:
> On Tue, Mar 17, 2015 at 4:17 PM, Julian Foad <julianfoad_at_gmail.com> wrote:
>> On 13 March 2015, Julian Foad wrote:
>>> Dear fans of move tracking,
>>>
>>> I heartily invite you to help by playing with 'svnmover'. Can you have
>>> a go and see what it can do? It's quite fun to play with (in a nerdy
>>> way :-)
>>
>> One unimplemented bit you might come across is 'svnmover merge'
>> doesn't try to merge file content. It reports a conflict if file
>> content (text and/or props) needs merging. That's simply because it
>> isn't directly relevant to the move logic so I didn't bother to
>> implement it yet; we can use directories instead of files, or files
>> without content changes, to test the move logic. Please feel free to
>> add text and props merging code near the comment
>>
>> /* ### Need not conflict if can merge props and text separately. */
>>
>> in svnmover.c:element_merge(), if you fancy doing so.
>>
>> Anyone tried or planning to try this, yet?
>>
>
> I intend to take a closer look soon. But as you know, my definition of
> "soon" is a bit ... vague ;-).
>
> I greatly appreciate your efforts to get "move support" ... moving in svn.
>

First hurdle: I have trouble compiling it (on Windows 7, VS 2013).
Both with "release" and with "debug" configuration:

1) Debug configuration

[[[
..\..\..\subversion\libsvn_delta\compat3p.c(783): error C2121: '#' :
invalid character : possibly the result of a macro
 expansion [C:\research\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3p.c(783): error C2065: 'ifdef'
: undeclared identifier [C:\research\svn\dev\mov
e-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3p.c(783): error C2440:
'function' : cannot convert from 'int' to 'svn_pathrev_t
' [C:\research\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3p.c(783): error C4024:
'svn_editor3p_cp' : different types for formal and actua
l parameter 2 [C:\research\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3p.c(783): error C2146: syntax
error : missing ')' before identifier 'SVN_EDITOR
3_WITH_COPY_FROM_THIS_REV'
[C:\research\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3p.c(783): error C2198:
'svn_editor3p_cp' : too few arguments for call [C:\resea
rch\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3p.c(836): error C2143: syntax
error : missing '{' before '*' [C:\research\svn\d
ev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
]]]

I might look more into this later, but I thought I'd already mention it here.

2) Release configuration (maybe it's not necessary to be able to build
it in release configuration at this point, but I'm mentioning it here
for completeness)

[[[
..\..\..\subversion\libsvn_delta\branch.c(582): error C4013: 'SVN_DBG'
undefined; assuming extern returning int [C:\res
earch\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3e.c(883): error C4013:
'SVN_DBG' undefined; assuming extern returning int [C:\r
esearch\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3e.c(1200): error C4013:
'peg_path_str' undefined; assuming extern returning int
 [C:\research\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3e.c(1200): error C4047: ':' :
'int' differs in levels of indirection from 'char
 [6]' [C:\research\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3e.c(1395): error C4047: ':' :
'int' differs in levels of indirection from 'char
 [6]' [C:\research\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3p.c(783): error C2121: '#' :
invalid character : possibly the result of a macro
 expansion [C:\research\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3p.c(783): error C2065: 'ifdef'
: undeclared identifier [C:\research\svn\dev\mov
e-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3p.c(783): error C2440:
'function' : cannot convert from 'int' to 'svn_pathrev_t
' [C:\research\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3p.c(783): error C4024:
'svn_editor3p_cp' : different types for formal and actua
l parameter 2 [C:\research\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3p.c(783): error C2146: syntax
error : missing ')' before identifier 'SVN_EDITOR
3_WITH_COPY_FROM_THIS_REV'
[C:\research\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3p.c(783): error C2198:
'svn_editor3p_cp' : too few arguments for call [C:\resea
rch\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3p.c(810): error C4013:
'SVN_DBG' undefined; assuming extern returning int [C:\r
esearch\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_delta\compat3p.c(836): error C2143: syntax
error : missing '{' before '*' [C:\research\svn\d
ev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_delta.vcxproj]
..\..\..\subversion\libsvn_ra_local\ra_plugin.c(1055): error C4013:
'SVN_DBG' undefined; assuming extern returning int
[C:\research\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_ra_local.vcxproj]
..\..\..\subversion\libsvn_ra\ra_loader.c(708): error C4013: 'SVN_DBG'
undefined; assuming extern returning int [C:\res
earch\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_ra.vcxproj]
..\..\..\subversion\libsvn_ra\ra_loader.c(1011): error C4013:
'svn_dbg__quiet_mode' undefined; assuming extern returnin
g int [C:\research\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_ra.vcxproj]
..\..\..\subversion\libsvn_wc\update_editor.c(5104): error C4013:
'SVN_DBG' undefined; assuming extern returning int [C
:\research\svn\dev\move-tracking-2\build\win32\vcnet-vcproj\libsvn_wc.vcxproj]
]]]

-- 
Johan