[svk-users] Strange svk:merge 'corruption'...
Brice Figureau
brice+svk at daysofwonder.com
Thu Aug 9 03:11:51 EDT 2007
On Wed, 2007-08-08 at 17:15 +0200, Brice Figureau wrote:
> Hi,
>
[snipped]
> 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...).
After more test on a test repository I couldn't reproduce the missing
change on pull my co-worker got yesterday.
It seems that the merge-ticket moving backwards issue I'm referring
above is harmless: it happens everytime someone pushes to the upstream
SVN if he didn't pull, and still svk is able at next pull to remember
where was the last merge point.
So I'm still wondering why my co-worker missed a change when using svk
pull.
If someone has an idea, beacuse I don't want that to happen again...
More information about the svk-users
mailing list