If you are the only one working with your repo, why are you even making a local copy of the tree in your svk depot? You know you can checkout a working copy directly from a mirrored path and commit to it right? Then you don't need svk push/svk pull, unless you are making a local branch to work on some change off line.
<br><br>I think what might be going wrong is that your local branch is at the level of the whole tree, and your working copy checkouts are just a subtree like trunk. Since svk only keeps merge tracking information at a single level in the project hierarchy, you always want to branch and merge at the same level, so always branch from trunk, or branches/foo or tags/foo, but if you branch trunk/bar and try to use smerge, it won't take into account any merges done at the trunk level.
<br><br>Michael<br><br><div><span class="gmail_quote">On 4/27/07, <b class="gmail_sendername">Michael Peters</b> <<a href="mailto:mpeters@plusthree.com">mpeters@plusthree.com</a>> wrote:</span><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Brice Figureau wrote:<br><br>> What gives:<br>> svk info //local/krang/trunk/krang<br><br>[mpeters@localhost krang_again]$ cd<br>[mpeters@localhost ~]$ svk info //local/krang/trunk/krang<br>Depot Path: //local/krang/trunk/krang
<br>Revision: 27430<br>Last Changed Rev.: 27412<br>Copied From: /mirror/krang/trunk/krang, Rev. 26193<br>Merged From: /mirror/krang/trunk/krang, Rev. 26193<br>Merged From: /local/krang/trunk/krang, Rev. 22312<br><br>So it doesn't appear that it mentions #27397 there.
<br><br>> Does ~/.svk/local/db/revs contains a file named 27397 ?<br><br>It does now.<br><br>[mpeters@localhost ~]$ ls .svk/local/db/revs/27397<br>.svk/local/db/revs/27397<br><br>But I don't know if this is just an artifact of when I tried to push my repo
<br>past 27397 with garbage commits.<br><br>> Maybe that's just ~/.svk/config that contains an "invalid" entry ?<br><br>I really wish it would be that easy. But I moved my .svk/config to<br>.svk/config.bak and tried checking out a new copy of //local/krang/trunk/krang
<br>and then pulling in the recent changes and all I get is<br><br>Auto-merging (26199, 27430) /mirror/krang/branches/ajax_and_new_skin to<br>/local/krang/branches/ajax_and_new_skin (base<br>/local/krang/trunk/krang:22312\n689d98c0-9023-0410-9c0b-f79783857903:/branches/ajax_and_new_skin:3771\n689d98c0-9023-0410-9c0b-f79783857903:/trunk/krang:3802\n6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/krang_ajax_and_new_skin:28207\n6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/krang_trunk/krang:27397).
<br>Filesystem has no item: File not found: revision 27397, path<br>'/local/krang/trunk/krang:22312\n689d98c0-9023-0410-9c0b-f79783857903:/branches/ajax_and_new_skin:3771\n689d98c0-9023-0410-9c0b-f79783857903:/trunk/krang:3802\n6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/krang_ajax_and_new_skin:28207\n6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/krang_trunk/krang'
<br><br>> And if you get a working copy of //local/krang/trunk/krang, at which<br>> revision are you ?<br><br>27424<br><br>> Maybe fixing the config file could be enough to push your changes (this<br>> is a complete blind suggestion).
<br>><br>> Other than that, maybe you can push by doing a manual smerge against the<br>> latest known revision of your current working copy.<br><br>Nope, doing another smerge results in the same error: Filesystem has no item:
<br>File not found: revision 27397.<br><br>I've gone back to working with svn for now. If I feel like gambling again, I<br>might just remove all my svk stuff and start from scratch.<br><br>--<br>Michael Peters<br>Developer
<br>Plus Three, LP<br><br>_______________________________________________<br>svk-devel mailing list<br><a href="mailto:svk-devel@bestpractical.com">svk-devel@bestpractical.com</a><br><a href="http://lists.bestpractical.com/cgi-bin/mailman/listinfo/svk-devel">
http://lists.bestpractical.com/cgi-bin/mailman/listinfo/svk-devel</a><br></blockquote></div><br>