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

[Brice Figureau]

Hi,

I'm using svk (2.0.1 with subversion bindings 1.4.2) with a few others
developpers since a few month without any troubles.

Today one of my co-worker encountered a strange issue:
When issueing svk push -lC, svk wanted to push files he didn't touch or
commit.

We tried to understand the issue and found that his local branch
(//local/www) was missing a changeset (4246) coming from a mirrored SVN
repository.

I suspected a merge ticket issue, so I started to look to svk:merge
properties modification in this mirrored SVN repository and found that
one svk push I did yesterday modified the property in a strange way:

svk diff -c 4247  //remote/www/trunk/
...change skipped...
___________________________________________________________________
Name: svk:merge
  2ad53c07-96d1-4b4f-8c22-08f7cf95a899:/local/www:4449
  98d098b2-0987-40f7-bafc-e6b25d018214:/dow/local:3727
 -98d098b2-0987-40f7-bafc-e6b25d018214:/local/www/trunk:7855
 -c6d29c4a-41b8-4564-80a7-95aacd0c8f7f:/local/www:4240
 -c6d29c4a-41b8-4564-80a7-95aacd0c8f7f:/local/www-userpages:4243
 +98d098b2-0987-40f7-bafc-e6b25d018214:/local/www/trunk:7836
 +c6d29c4a-41b8-4564-80a7-95aacd0c8f7f:/local/www:4196
 +c6d29c4a-41b8-4564-80a7-95aacd0c8f7f:/local/www-userpages:4166
  da23ae6e-ab85-4ea2-80ec-cbadbd200116:/local/billisship:4015
  da23ae6e-ab85-4ea2-80ec-cbadbd200116:/local/m44-editor:4214
 -da23ae6e-ab85-4ea2-80ec-cbadbd200116:/local/www:4238
 +da23ae6e-ab85-4ea2-80ec-cbadbd200116:/local/www:4180
  da23ae6e-ab85-4ea2-80ec-cbadbd200116:/local/www-bleditor:3826
  da23ae6e-ab85-4ea2-80ec-cbadbd200116:/local/www-bnp:3947
  da23ae6e-ab85-4ea2-80ec-cbadbd200116:/local/www-quickbooks:3832
  fa954469-7010-4da2-b506-9a99099ebb4d:/branches/www-dow-umbrella:3981
 -fa954469-7010-4da2-b506-9a99099ebb4d:/local/www:4219
 +fa954469-7010-4da2-b506-9a99099ebb4d:/local/www:4226

Notice how many merge-ticket were pushed backward. 
My change should only have touched my merge-ticket (fa954469...).

This might not be the root cause of the missing rev my co-worker saw,
but I find that highly suspicious.

I could find in my terminal the commands that lead to this changeset
4247.
Usually I "svk pull" just before "svk push", but I was in an hurry and
issued directly a "svk push" without any pull before:

$ svk push -l --verbatim 
Auto-merging (4219, 4226) /local/www to /prj/www/trunk
(base /prj/www/trunk:4224).
Merging back to mirror source svn+ssh://devl.domain.com/devl/svn/www.
A   common/php/scripts/encodeMailHeader.php
New merge ticket: fa954469-7010-4da2-b506-9a99099ebb4d:/local/www:4226
Merge back committed as revision 4064.
Syncing svn+ssh://devl.daysofwonder.com/devl/svn/www
Retrieving log information from 4060 to 4064
Committed revision 4227 from revision 4060.
Committed revision 4228 from revision 4061.
Committed revision 4229 from revision 4062.
Committed revision 4230 from revision 4063.
Committed revision 4231 from revision 4064.

Is it a known problem?
Can you spot something strange?
How can I make sure it won't happen again?
Thanks for any answer,
-- 
Brice Figureau <brice+svk at daysofwonder.com>