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

[Brice Figureau]

Hi,

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

On Tue, 2007-04-24 at 13:40 +0100, Adrian Howard wrote:
> [snipped]
>    % svk push --verbatim
>    Auto-merging (773, 775) /local/projects/allchefs/trunk to /mirror/ 
> projects/allchefs/trunk (base /mirror/projects/yes-chef/trunk:645).
>    ===> Auto-merging (773, 775) /local/projects/allchefs/trunk to / 
> mirror/projects/allchefs/trunk (base /mirror/projects/yes-chef/trunk: 
> 645).
>    Merging back to mirror source svn+ssh://adrian@meshy2.intunet/var/ 
> svn.
>    g   sql/01-schema.sql
>    Gg  sql
>    Gg  public_html/allchefs
>    g   public_html/styles/content.css
>    [ ... lots more ... ]
>    g   lib/IWA/Base.pm
>    g   lib/IWA/DB/Object.pm
>    g   lib/IWA/DB/Objects.pm
>    G   lib/IWA/DB
>    Conflict found in lib/IWA/PayPal/Button.pm:
>    e)dit, d)iff, m)erge, s)kip, t)heirs, y)ours, h)elp? [e] s
>    C   lib/IWA/PayPal/Button.pm
>    G   lib/IWA/PayPal
>    g   lib/IWA/Build.pm
>    g   lib/IWA/Dispatch.pm
>    [ ... lots more ... ]
>     g  .
>    New merge ticket: e0a4bcc3-72c2-4cf0-9b3f-83de80ffcb83:/local/ 
> projects/allchefs/trunk:775
>    Empty merge.
>    1 conflict found.

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.


> 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.

> 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.

HTH,
-- 
Brice Figureau <brice+svk at daysofwonder.com>