[Lazarus] Problem using the SVN program: source files "mutilated"
Vincent Snijders
vincent.snijders at gmail.com
Wed Feb 18 16:24:19 CET 2009
Bart schreef:
> Hi,
>
> I'm experiencing a problem using SVN.
> When I have written patches for Lazarus, then do an svn update (after
> the patches have been committed), the sourcefiles that I have altered
> are not updated correctly.
>
> For instance. I recently made changes to lcl\include\dbedit.inc
> These changes have been committed.
> Today I did an svn update.
>
> In lcl\include\dbedit.inc SVN has inserted lines like:
>
> <<<<<<<<<<<<<<.mine
> procedure TDBEdit.KeyPress(var Key: char);
> function CanAcceptKey: boolean;
>
>
>
>
> ================
>
> (^^ this line above is also inserted)
>
> (And yes, this is exactly the procedure I changed)
>
> Now of course make fails on that line.
>
> I'm using the commandline SVN (not the tortoisesvn windows client) on Win9x.
>
> I have done a svn cleanup, but that made no difference.
You may try svn revert to remove you local changes.
>
> Has anyone any idea why this happens, and how I can cure this?
>
Sure, see http://svnbook.red-bean.com/en/1.1/ch03s05.html
Resolve Conflicts (Merging Others' Changes)
Vincent
More information about the Lazarus
mailing list