You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Tom Browder <to...@gmail.com> on 2008/08/27 23:54:18 UTC
New SVN Repos from CVS
I have exercised my cvs2svn conversion process (using subversion
1.5.1) a couple of times now to work out the warts. But I have one
problem that is not CVS-related.
For years our main line of development has been on a branch (call it
X) on the CVS repo. And the new SVN shows the history on that branch
just fine.
What I would like to do is save the current trunk (hasn't been used in
four or five years) to a branch, and make branch X become the trunk.
Is there any clean way to do that?
First I saved the existing state of the trunk:
# seems to do what I want
svn cp prog/trunk prog/branches/orig-trunk
Then I dumbly tried:
svn cp prog/branches/X prog/trunk
which obviously put a directory X in the trunk--not what was intended.
I don't think a merge is the answer because I want the existing state
of branch X to become the trunk as it is.
I haven't tried it yet, but can I do:
svn cp prog/branches/X/* prog/trunk
or
svn mv prog/branches/X/* prog/trunk
If so, then can I do
svn rm prog/branches/X
Thanks for any suggestions.
-Tom
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: New SVN Repos from CVS
Posted by Blair Zajac <bl...@orcaware.com>.
Tom Browder wrote:
> On Thu, Aug 28, 2008 at 2:22 AM, Alan Barrett <ap...@cequrux.com> wrote:
>> On Wed, 27 Aug 2008, Tom Browder wrote:
>>> svn rm prog/trunk
>>> svn cp prog/branches/X prog/trunk
>>>
>>> Wow, I have to start thinking big with svn! Looks like it should
>>> work. Anyone see any problems?
>> Yes, that will work, but it makes the change in two revisions. The
>> trunk will not exist at all during the time between the two commits,
>> which may be confusing or otherwise undesirable, especially if people in
>> the future attempt to diff against old revisions of the trunk.
>>
>> I'd use mucc to do it all in a single revision:
>>
>> REPO="svn://server/repo"
>> BRANCHREV="42"
>> mucc -m "Delete old trunk and replace it with a copy of branch X" \
>> rm "$REPO/prog/trunk" \
>> cp "$BRANCHREV" "$REPO/prog/branches/X" "$REPO/prog/trunk"
>>
>> mucc is available somewhere in the svn source code, but it's not
>> installed by default, and you might find it named either "svnmucc" or
>> "mucc" depending on the version of svn.
>
> Do you know if it is intended for mucc someday to be a "normally"
> available admin or user function?
No, there's no intentions of that currently.
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: New SVN Repos from CVS
Posted by Tom Browder <to...@gmail.com>.
On Thu, Aug 28, 2008 at 2:22 AM, Alan Barrett <ap...@cequrux.com> wrote:
> On Wed, 27 Aug 2008, Tom Browder wrote:
>> svn rm prog/trunk
>> svn cp prog/branches/X prog/trunk
>>
>> Wow, I have to start thinking big with svn! Looks like it should
>> work. Anyone see any problems?
>
> Yes, that will work, but it makes the change in two revisions. The
> trunk will not exist at all during the time between the two commits,
> which may be confusing or otherwise undesirable, especially if people in
> the future attempt to diff against old revisions of the trunk.
>
> I'd use mucc to do it all in a single revision:
>
> REPO="svn://server/repo"
> BRANCHREV="42"
> mucc -m "Delete old trunk and replace it with a copy of branch X" \
> rm "$REPO/prog/trunk" \
> cp "$BRANCHREV" "$REPO/prog/branches/X" "$REPO/prog/trunk"
>
> mucc is available somewhere in the svn source code, but it's not
> installed by default, and you might find it named either "svnmucc" or
> "mucc" depending on the version of svn.
Do you know if it is intended for mucc someday to be a "normally"
available admin or user function?
Thanks for the good advice, Alan.
-Tom
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: New SVN Repos from CVS
Posted by Alan Barrett <ap...@cequrux.com>.
On Wed, 27 Aug 2008, Tom Browder wrote:
> svn rm prog/trunk
> svn cp prog/branches/X prog/trunk
>
> Wow, I have to start thinking big with svn! Looks like it should
> work. Anyone see any problems?
Yes, that will work, but it makes the change in two revisions. The
trunk will not exist at all during the time between the two commits,
which may be confusing or otherwise undesirable, especially if people in
the future attempt to diff against old revisions of the trunk.
I'd use mucc to do it all in a single revision:
REPO="svn://server/repo"
BRANCHREV="42"
mucc -m "Delete old trunk and replace it with a copy of branch X" \
rm "$REPO/prog/trunk" \
cp "$BRANCHREV" "$REPO/prog/branches/X" "$REPO/prog/trunk"
mucc is available somewhere in the svn source code, but it's not
installed by default, and you might find it named either "svnmucc" or
"mucc" depending on the version of svn.
--apb (Alan Barrett)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: New SVN Repos from CVS
Posted by Tom Browder <to...@gmail.com>.
On Wed, Aug 27, 2008 at 6:59 PM, John Niven <jn...@bravurasolutions.com> wrote:
>> -----Original Message-----
>> From: Tom Browder [mailto:tom.browder@gmail.com]
>> Sent: Thursday, 28 August 2008 11:54
>> To: users@subversion.tigris.org
>> Subject: New SVN Repos from CVS
...
>> What I would like to do is save the current trunk (hasn't
>> been used in four or five years) to a branch, and make branch
>> X become the trunk.
>> Is there any clean way to do that?
...
>> First I saved the existing state of the trunk:
>>
>> # seems to do what I want
>> svn cp prog/trunk prog/branches/orig-trunk
>>
>> Then I dumbly tried:
>>
>> svn cp prog/branches/X prog/trunk
...
> Since trunk is safe (copied to prog/branches/orig-trunk), can you not
> simply delete trunk (prog/trunk) and then copy prog/branches/X to trunk?
> (Or am I missing something obvious?)
You mean
svn rm prog/trunk
svn cp prog/branches/X prog/trunk
Wow, I have to start thinking big with svn! Looks like it should
work. Anyone see any problems?
Thanks, John.
-Tom
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: New SVN Repos from CVS
Posted by John Niven <jn...@bravurasolutions.com>.
> -----Original Message-----
> From: Tom Browder [mailto:tom.browder@gmail.com]
> Sent: Thursday, 28 August 2008 11:54
> To: users@subversion.tigris.org
> Subject: New SVN Repos from CVS
>
...
>
> For years our main line of development has been on a branch (call it
> X) on the CVS repo. And the new SVN shows the history on
> that branch just fine.
>
> What I would like to do is save the current trunk (hasn't
> been used in four or five years) to a branch, and make branch
> X become the trunk.
> Is there any clean way to do that?
>
> First I saved the existing state of the trunk:
>
> # seems to do what I want
> svn cp prog/trunk prog/branches/orig-trunk
>
> Then I dumbly tried:
>
> svn cp prog/branches/X prog/trunk
>
> which obviously put a directory X in the trunk--not what was intended.
Since trunk is safe (copied to prog/branches/orig-trunk), can you not
simply delete trunk (prog/trunk) and then copy prog/branches/X to trunk?
(Or am I missing something obvious?)
Cheers
John
>
> I don't think a merge is the answer because I want the
> existing state of branch X to become the trunk as it is.
>
> I haven't tried it yet, but can I do:
>
> svn cp prog/branches/X/* prog/trunk
>
> or
>
> svn mv prog/branches/X/* prog/trunk
>
> If so, then can I do
>
> svn rm prog/branches/X
>
> Thanks for any suggestions.
>
> -Tom
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org