[svk-devel] svk push confusion - plea for help

[Adrian Howard]

Hi Brice,

On 24 Apr 2007, at 13:55, Brice Figureau wrote:

> Hi,
>
> I'm not that fluent in svk, so I might be completely wrong :-)

No worries - any suggestions help.

[snip]
> It looks like you forgot:
> svk sync
> and
> svk smerge
> or
> svk pull
>
> to put in sync your own mirror (and respectively your checkout) of svn
> +ssh://adrian@meshy2.intunet/var/svn.
>
> Someone certainly commited changes to this svn repository, and when
> you're pushing yours, it conflicts.
[snip]

Nope. I'm the only person using the repo. And just to double check I  
did a pull and it didn't change the results.


>> The things that confuse me:
>>
>> 1) Why all the merges with the other files. I've not touched them and
>> they do not appear to be different - e.g.
>>
>>    % svk diff -v /intunet/mirror/projects/allchefs/trunk/lib/IWA/
>> Base.pm /intunet/local/projects/allchefs/trunk/lib/IWA/Base.pm
>
> You're comparing with what you have locally in your mirror and not the
> original svn repository.

Nobody but me making changes...


>> 2) Why is the simple change I made to lib/IWA/PayPal/Button.pm being
>> marked as a conflict?
>
> Someone certainly commited a conflicting change directly to the  
> (remote)
> subversion repository.

Nope. Identical - as separate "svn cat" showed.

Adrian