[svk-devel] SVK MOVE broken in 1.08 across a push/pull?
Derek Atkins
warlord at MIT.EDU
Thu Aug 10 21:58:54 EDT 2006
Quoting Chia-Liang Kao <clkao at clkao.org>:
> On 11/08/06, Derek Atkins <warlord at mit.edu> wrote:
>> I just updated to 1.08, but it looks like "svk move" is still broken.
>> I created an SVN repository on a "remote" server, put a couple of
>> files in it, and then mirrored the repo into svk. Then I made a local
>> copy of the mirror. I made two checkouts, one from the mirror and one
>> from the local copy of the mirror. I did 'svk move' from the mirror
>> checkout and committed. THAT worked fine, as you can see from from
>> the logs below. HOWEVER, when I did an "svk pull" into the local copy
>> it lost the log info across the move. This is probably the same problem
>> I ran into on 1.07 in the other direction.
>>
>> Am I doing something wrong or is this really a bug?
>
> This is not supported in svk 1.x mainly due to a svn api deficiency.
> We do something clever in trunk svk to support this. So please try
> out trunk, which will be 2.0 RSN.
Okay, I pulled down trunk. Moves now work across a pull (thanks!) but
not across a push. Here's the log. This log is sort of a continuation
of my last one... (i.e., it assumes the same state from the end of my last
log).
-derek
[warlord at cliodev trunk]$ svk --version
This is svk, version 1.99_01.
...
[warlord at cliodev mirror]$ ls -l
total 8
drwxrwxr-x 2 warlord warlord 4096 Aug 10 18:59 dir1
[warlord at cliodev mirror]$ svk move dir1/Domestic\ 9.19.05.xls .
A ./Domestic 9.19.05.xls
D dir1/Domestic 9.19.05.xls
[warlord at cliodev mirror]$ svk commit -m "moved Domestic back to top-level"
Commit into mirrored path: merging back directly.
Merging back to mirror source svn+ssh://cliosrv.ihtfp.org/repo/test.
Merge back committed as revision 6.
Syncing svn+ssh://cliosrv.ihtfp.org/repo/test
Retrieving log information from 6 to 6
Committed revision 11 from revision 6.
[warlord at cliodev mirror]$ svk log Domestic\ 9.19.05.xls
----------------------------------------------------------------------
r11 (orig r6): warlord | 2006-08-10 21:49:42 -0400
moved Domestic back to top-level
----------------------------------------------------------------------
r9 (orig r5): warlord | 2006-08-10 18:59:30 -0400
move Domestic to dir1
----------------------------------------------------------------------
r5 (orig r2): warlord | 2006-08-10 18:33:25 -0400
commited
----------------------------------------------------------------------
[warlord at cliodev mirror]$ cd ../local/
[warlord at cliodev local]$ svk pull
Syncing svn+ssh://cliosrv.ihtfp.org/repo/test
Auto-merging (9, 11) /mirrors/test to /local/test (base /mirrors/test:9).
D dir1/Domestic 9.19.05.xls
A + Domestic 9.19.05.xls
New merge ticket: 51a47e92-b01a-0410-b17a-b1b5f062dc7e:/test:6
Committed revision 12.
Syncing /test/local/test(/local/test) in /tmp/test/local to 12.
D dir1/Domestic 9.19.05.xls
A Domestic 9.19.05.xls
[warlord at cliodev local]$ svk log Domestic\ 9.19.05.xls
----------------------------------------------------------------------
r12: warlord | 2006-08-10 21:50:02 -0400
r11 at cliodev (orig r6): warlord | 2006-08-10 21:49:42 -0400
moved Domestic back to top-level
----------------------------------------------------------------------
r10: warlord | 2006-08-10 19:01:03 -0400
r9 at cliodev (orig r5): warlord | 2006-08-10 18:59:30 -0400
move Domestic to dir1
----------------------------------------------------------------------
[warlord at cliodev local]$ ls -l
total 40
drwxrwxr-x 2 warlord warlord 4096 Aug 10 21:50 dir1
-rwxrwxr-x 1 warlord warlord 27648 Aug 10 21:50 Domestic 9.19.05.xls
[warlord at cliodev local]$ svk move Domestic\ 9.19.05.xls dir1/
A dir1/Domestic 9.19.05.xls
D Domestic 9.19.05.xls
[warlord at cliodev local]$ svk commit -m "moved back to dir1 from local copy"
Committed revision 13.
[warlord at cliodev local]$ svk push --verbatim
Auto-merging (0, 13) /local/test to /mirrors/test (base /mirrors/test:11).
===> Auto-merging (0, 8) /local/test to /mirrors/test (base /mirrors/test:7).
Merging back to mirror source svn+ssh://cliosrv.ihtfp.org/repo/test.
Empty merge.
===> Auto-merging (8, 10) /local/test to /mirrors/test (base /mirrors/test:9).
Merging back to mirror source svn+ssh://cliosrv.ihtfp.org/repo/test.
Empty merge.
===> Auto-merging (10, 12) /local/test to /mirrors/test (base
/mirrors/test:11).Merging back to mirror source
svn+ssh://cliosrv.ihtfp.org/repo/test.
Empty merge.
===> Auto-merging (12, 13) /local/test to /mirrors/test (base
/mirrors/test:11).Merging back to mirror source
svn+ssh://cliosrv.ihtfp.org/repo/test.
A dir1/Domestic 9.19.05.xls
D Domestic 9.19.05.xls
New merge ticket: 5d4e1094-8078-4896-9f51-d38c6ebae2f2:/local/test:13
Merge back committed as revision 7.
Syncing svn+ssh://cliosrv.ihtfp.org/repo/test
Retrieving log information from 7 to 7
Committed revision 14 from revision 7.
[warlord at cliodev local]$ svk log dir1/Domestic\ 9.19.05.xls
----------------------------------------------------------------------
r13: warlord | 2006-08-10 21:51:07 -0400
moved back to dir1 from local copy
----------------------------------------------------------------------
r12: warlord | 2006-08-10 21:50:02 -0400
r11 at cliodev (orig r6): warlord | 2006-08-10 21:49:42 -0400
moved Domestic back to top-level
----------------------------------------------------------------------
r10: warlord | 2006-08-10 19:01:03 -0400
r9 at cliodev (orig r5): warlord | 2006-08-10 18:59:30 -0400
move Domestic to dir1
----------------------------------------------------------------------
[warlord at cliodev local]$ cd ../mirror/
[warlord at cliodev mirror]$ svk pull
Syncing svn+ssh://cliosrv.ihtfp.org/repo/test
Syncing /test/mirrors/test(/mirrors/test) in /tmp/test/mirror to 14.
A dir1/Domestic 9.19.05.xls
D Domestic 9.19.05.xls
[warlord at cliodev mirror]$ svk log dir1/Domestic\ 9.19.05.xls
----------------------------------------------------------------------
r14 (orig r7): warlord | 2006-08-10 21:51:25 -0400
moved back to dir1 from local copy
----------------------------------------------------------------------
--
Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
Member, MIT Student Information Processing Board (SIPB)
URL: http://web.mit.edu/warlord/ PP-ASEL-IA N1NWH
warlord at MIT.EDU PGP key available
More information about the svk-devel
mailing list