[svk-users] Strange svk:merge 'corruption'...

[Brice Figureau]

On Thu, 2007-08-09 at 19:48 +0800, Chia-Liang Kao wrote:
> On 09/08/07, Brice Figureau <brice at daysofwonder.com> wrote:
> > Hum, I don't see why the upstream server would conflict such merge, it
> > has no way to understand that the changeset "reverts" back some
> > merge-tickets.
> > Forgive my complete ignorance on how SVK (or even SVN) is working, but
> > I'd though that svk would fetch the latest known svk:merge properties,
> > modifies the merge-ticket it uses and then commit the property change to
> > the upstream svn server ?
> 
> because when you don't have the mirror fully synced, svk is trying to
> set the svk:merge property based on non-head, merged with the tickets
> caused by the merge.  This should result in a svn tree level conflict
> but it doesn't.

Ah ok, got it. 
So if the merge conflicts, the user has to sync and push again, right.
Our server is running SVN 1.4.2 if that matters.

> > > do you have more detailed info for your coworker's depot?  how was the
> > > previous merge or pull done? and which change included the ticket for
> > > the missing one but didn't bring the content?
> >
> > Yes, I did see my cross-post svk-devel/svk-users:
> > http://lists.bestpractical.com/pipermail/svk-devel/2007-August/001032.html
> 
> Looking.

OK, thanks. Let me know if you need more material.
-- 
Brice Figureau <brice+svk at daysofwonder.com>