Re: Automated Merge Conflict Resolution before svn 1.5?

Hi Hari,

Thanks - that's actually the solution I just started coding ;) Was kinda
hoping I'd find a cleaner svn way to do it, but at least it'll fix things
for now. Thanks for the reply - I appreciate it :)

M@

> During conflicts, svn will create the following files:
> file.mine
> file.rOLDREV
> file.rNEWREV
>
> In your case, you want to take the NEWREV (which is "their" change). You
> will have to do some scripting to find out that revision number. In your
> case, I think it will always be the higher number.
>
> So, just do
> cp file.rNEWREV file
> svn resolved file
> svn commit
>
> This will be the equivalent of taking 'their' change. Not straightforward,
> but scriptable.
>
> Thanks,
> -Hari
>

Thanks - that's actually the solution I just started coding ;) Was kinda
hoping I'd find a cleaner svn way to do it, but at least it'll fix things
for now. Thanks for the reply - I appreciate it :)

M@
Received on 2008-01-16 21:40:05 CET