[svk-devel] Another svk pull issue...

Thu Aug 23 05:35:19 EDT 2007

Hi,

Another svk pull issue yesterday following what I described in:
http://lists.bestpractical.com/pipermail/svk-devel/2007-August/001032.html

This is still svk 2.0.1 with subversion bindings 1.4.3 on the same SVN
repository but on another depot on another machine.

This time, I lost log messages of two upstream revisions (and maybe the
changes, but I'm not sure) after doing my usual:

$ cd /path/to/my/checkout
$ svk pull
Syncing svn+ssh://domain.com/www
Retrieving log information from 4089 to 4098
Committed revision 4542 from revision 4089.
Committed revision 4543 from revision 4090.
Committed revision 4544 from revision 4091.
Committed revision 4545 from revision 4092.
Committed revision 4546 from revision 4093.
Committed revision 4547 from revision 4094.
Committed revision 4548 from revision 4095.
Committed revision 4549 from revision 4096.
Committed revision 4550 from revision 4097.
Committed revision 4551 from revision 4098.
Auto-merging (4539, 4551) /remote/www/trunk to /local/www
(base /local/www:4540).
...
U   memoir44.com/pdf-images/png_188x217/mp_tag4.png
U   memoir44.com/pdf-images/png_188x217/mp_tag11.png
U   memoir44.com/pdf-images/png_188x217/mp_tag5.png
U   memoir44.com/pdf-images/png_188x217/mp_tag12.png
...
New merge ticket: 3a2cc915-d117-0410-b7b0-c6a00d66b608:/trunk:4098
New merge ticket:
98d098b2-0987-40f7-bafc-e6b25d018214:/local/www/trunk:7925
New merge ticket: fa954469-7010-4da2-b506-9a99099ebb4d:/local/www:4696
New merge ticket: ffd003c9-104b-4314-85c2-3d22624415a7:/local/www:92
Committed revision 4552.
Syncing //local/www(/local/www) in /Users/brice/cvs/www to 4552.
Conflict found in common/php/include/generate_deps.php:
e)dit, d)iff, m)erge, s)kip, t)heirs, y)ours, h)elp? [e] t
G   common/php/include/generate_deps.php
...
U   memoir44.com/pdf-images/png_188x217/mp_tag4.png
U   memoir44.com/pdf-images/png_188x217/mp_tag11.png
U   memoir44.com/pdf-images/png_188x217/mp_tag5.png
U   memoir44.com/pdf-images/png_188x217/mp_tag12.png
...

The U files above are coming from orinigal SVN revision 4093 and 4094.

But, there is no log message for these original revisions!!
$ svk log mp_tag5.png
----------------------------------------------------------------------
r4552:  brice | 2007-08-22 19:09:17 +0200

 r4542 at macbook (orig r4089):  john | 2007-08-20 19:12:40 +0200
  r7910 at jfs:  john | 2007-08-20 10:05:03 -0700
  [commit msg elided to protect the innocents]

 r4543 at macbook (orig r4090):  john | 2007-08-20 19:13:06 +0200
  r7911 at jfs:  john | 2007-08-20 10:12:22 -0700
  [commit msg elided to protect the innocents]

 r4544 at macbook (orig r4091):  john | 2007-08-20 22:37:43 +0200
  r7914 at jfs:  john | 2007-08-20 13:33:00 -0700
  [commit msg elided to protect the innocents]

 r4545 at macbook (orig r4092):  john | 2007-08-20 22:37:51 +0200
  r7915 at jfs:  john | 2007-08-20 13:34:09 -0700
  [commit msg elided to protect the innocents]

 r4548 at macbook (orig r4095):  john | 2007-08-22 01:56:01 +0200
  r7923 at jfs:  john | 2007-08-21 16:55:44 -0700
  [commit msg elided to protect the innocents]

 r4549 at macbook (orig r4096):  brice | 2007-08-22 14:15:34 +0200
 [commit msg elided to protect the innocents]

 r4550 at macbook (orig r4097):  brice | 2007-08-22 15:51:49 +0200
 [commit msg elided to protect the innocents]

 r4551 at macbook (orig r4098):  john | 2007-08-22 19:07:56 +0200
  r7925 at jfs:  johnstockholm | 2007-08-22 10:07:11 -0700
  [commit msg elided to protect the innocents]

----------------------------------------------------------------------
r4540:  brice | 2007-08-17 20:36:41 +0200

 r4539 at macbook (orig r4087):  franck | 2007-08-16 20:32:03 +0200
  r4282 at beewee:  franck | 2007-08-16 20:29:55 +0200
  [commit msg elided to protect the innocents]

----------------------------------------------------------------------

Strangely enough, they are in the svn repository:
$ svn log svn+ssh://domain.com/www/trunk/memoir44.com/pdf-images/png_188x217/mp_tag5.png       
------------------------------------------------------------------------
r4098 | john | 2007-08-22 19:07:56 +0200 (Wed, 22 Aug 2007) | 3 lines

 r7925 at jfs:  johnstockholm | 2007-08-22 10:07:11 -0700
 [commit msg elided to protect the innocents]

------------------------------------------------------------------------
r4094 | john | 2007-08-22 00:59:25 +0200 (Wed, 22 Aug 2007) | 15 lines

 r7910 at jfs:  johnstockholm | 2007-08-20 10:05:03 -0700
 [commit msg elided to protect the innocents]
 r7911 at jfs:  johnstockholm | 2007-08-20 10:12:22 -0700
 [commit msg elided to protect the innocents]

 r7914 at jfs:  johnstockholm | 2007-08-20 13:33:00 -0700
 [commit msg elided to protect the innocents]
 r7915 at jfs:  johnstockholm | 2007-08-20 13:34:09 -0700
 [commit msg elided to protect the innocents]
 r7918 at jfs:  johnstockholm | 2007-08-21 14:47:08 -0700
 [commit msg elided to protect the innocents]
 r7919 at jfs:  johnstockholm | 2007-08-21 15:54:04 -0700
 [commit msg elided to protect the innocents]

------------------------------------------------------------------------
r4093 | yann | 2007-08-21 23:00:44 +0200 (Tue, 21 Aug 2007) | 5 lines

 r91 at c5850-a4-2-62-147-36-23:  yann | 2007-08-16 20:47:17 +0200
 Initial Creation of My Trunk
 r92 at c5850-a4-2-62-147-36-23:  yann | 2007-08-21 22:31:01 +0200
 [commit msg elided to protect the innocents]

------------------------------------------------------------------------
r4087 | franck | 2007-08-16 20:32:03 +0200 (Thu, 16 Aug 2007) | 3 lines

 r4282 at beewee:  franck | 2007-08-16 20:29:55 +0200
 [commit msg elided to protect the innocents]

On another machine, I ran the same svk pull (but earlier), and it did
work fine (the log is there):
$ svk pull
Syncing svn+ssh://domain.com/www
Retrieving log information from 4087 to 4095
Committed revision 4684 from revision 4087.
Committed revision 4685 from revision 4088.
Committed revision 4686 from revision 4089.
Committed revision 4687 from revision 4090.
Committed revision 4688 from revision 4091.
Committed revision 4689 from revision 4092.
Committed revision 4690 from revision 4093.
Committed revision 4691 from revision 4094.
Committed revision 4692 from revision 4095.
Auto-merging (4679, 4692) /prj/www/trunk to /local/www (base /local/www:4682).
...
New merge ticket: 2ad53c07-96d1-4b4f-8c22-08f7cf95a899:/local/www:4540
New merge ticket: 3a2cc915-d117-0410-b7b0-c6a00d66b608:/trunk:4095
New merge ticket: 98d098b2-0987-40f7-bafc-e6b25d018214:/local/www/trunk:7923
New merge ticket: c6d29c4a-41b8-4564-80a7-95aacd0c8f7f:/local/www-userpages:4282
New merge ticket: ffd003c9-104b-4314-85c2-3d22624415a7:/local/www:92
Committed revision 4693.
Syncing //local/www(/local/www) in /home/brice/cvs/www to 4693.
...

$ svk log mp_tag5.png
----------------------------------------------------------------------
r4693:  brice | 2007-08-22 14:14:25 +0200

 r4684 at arsenic (orig r4087):  franck | 2007-08-16 20:32:03 +0200
  r4282 at beewee:  franck | 2007-08-16 20:29:55 +0200
  [commit msg elided to protect the innocents]

 r4685 at arsenic (orig r4088):  brice | 2007-08-17 20:37:50 +0200
 [commit msg elided to protect the innocents]

 r4686 at arsenic (orig r4089):  john | 2007-08-20 19:12:40 +0200
  r7910 at jfs:  john | 2007-08-20 10:05:03 -0700
  [commit msg elided to protect the innocents]

 r4687 at arsenic (orig r4090):  john | 2007-08-20 19:13:06 +0200
  r7911 at jfs:  john | 2007-08-20 10:12:22 -0700
  [commit msg elided to protect the innocents]

 r4688 at arsenic (orig r4091):  john | 2007-08-20 22:37:43 +0200
  r7914 at jfs:  john | 2007-08-20 13:33:00 -0700
  [commit msg elided to protect the innocents]

 r4689 at arsenic (orig r4092):  john | 2007-08-20 22:37:51 +0200
  r7915 at jfs:  john | 2007-08-20 13:34:09 -0700
  [commit msg elided to protect the innocents]

 r4690 at arsenic (orig r4093):  yann | 2007-08-21 23:00:44 +0200
  r91 at c5850-a4-2-62-147-36-23:  yann | 2007-08-16 20:47:17 +0200
  [commit msg elided to protect the innocents]
  r92 at c5850-a4-2-62-147-36-23:  yann | 2007-08-21 22:31:01 +0200
  [commit msg elided to protect the innocents]

 r4691 at arsenic (orig r4094):  john | 2007-08-22 00:59:25 +0200
  r7910 at jfs:  john | 2007-08-20 10:05:03 -0700
  [commit msg elided to protect the innocents]
  r7911 at jfs:  john | 2007-08-20 10:12:22 -0700
  [commit msg elided to protect the innocents]

  r7914 at jfs:  john | 2007-08-20 13:33:00 -0700
  [commit msg elided to protect the innocents]
  r7915 at jfs:  john | 2007-08-20 13:34:09 -0700
  [commit msg elided to protect the innocents]
  r7918 at jfs:  john | 2007-08-21 14:47:08 -0700
  [commit msg elided to protect the innocents]
  r7919 at jfs:  john | 2007-08-21 15:54:04 -0700
  [commit msg elided to protect the innocents]

 r4692 at arsenic (orig r4095):  john | 2007-08-22 01:56:01 +0200
  r7923 at jfs:  john | 2007-08-21 16:55:44 -0700
  [commit msg elided to protect the innocents]

----------------------------------------------------------------------

Any ideas about what went wrong ?
Could this come from the fact that we mirror the full svn repository but
copyied only the trunk part instead of the full repository.

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