This isn't a very good subject, but here's the situation.
I've recently converted a fairly large project from cvs to svn. I told
everyone to check in their pending work on cvs branches, then used
cvs2svn to do the work. That worked out well. But somebody forgot a
project which had been put aside.
That cvs workspace is based on what's now revision 4148 in svn, and has
lots of changes in a cvs workspace. We are at about revision 8600 in
What I'd like to do is create an svn branch based on 4148, check it in
if necessary, copy in the changes from the cvs workspace using patch,
and check those in, then update the branch to the trunk head and (ugh)
debug the conflicts and other problems. Maybe I am thinking about this
I tried this; the workspace corresponds to svn info -r 4148
svn info -r 4148 $SVNROOT/build/trunk/vertica
Repository Root: svn+ssh://svn/repos
Repository UUID: c4c4507d-fb47-4471-b792-52309e25f909
Node Kind: directory
Last Changed Author: xyz
Last Changed Rev: 4148
Last Changed Date: 2006-12-22 19:00:05 -0500 (Fri, 22 Dec 2006)
Note the URL: says trunk/vertica, but I had previously svn move'd that
I tried making a normal branch, then checking out that version:
svn copy $SVNROOT/build/trunk $SVNROOT/build/branches/bill_blockhdr
svn ls $SVNROOT/build/branches/bill_blockhdr
svn co -r 4148 $SVNROOT/build/branches/bill_blockhdr/vertica
That worked, giving me the right files. I tried
svn ci -m 'based on 4148'
No messages. Then I used patch to apply the changes; no problems. Then
Changes are all there. Then
svn ci -m 'blockhdr changes from dec 2006'
Transmitting file data ..................svn: Commit failed (details
svn: Path 'Basics' not present
WHAT does that mean?? Basics/Basics.mk has always been there.
svn stat shows the changes; svn info shows revision 4148.
Now I'm confused -- I've got the files I want, and this worked:
svn copy . $SVNROOT/build/branches/bill_old
Committed revision 8752.
What to do next?
Received on Tue Sep 25 00:17:50 2007
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com