> -----Original Message-----
> From: Ryan Schmidt [mailto:subversion-2007b@ryandesign.com]
> Sent: Monday, October 01, 2007 4:24 AM
> To: JfK Viper
> Cc: Srilakshmanan, Lakshman; Binod; users@subversion.tigris.org
> Subject: Re: Fwd
>
> On Sep 30, 2007, at 23:01, JfK Viper wrote:
>
> > What I did was I checked out everything from my
> /project/branch and
> > then removed all .svn files from all the folders and then
> deleted the
> > whole /project/trunk
> > /branches/
> > /tags
> >
> > and then I did mkdir /project/trunk
> > /branches/
> > /tags and then copied all
> > those files and folders, that were checked out earlier from
> where .svn
> > folders were removed, to my /trunk folder and then did
> initial import
> > using svn import
> >
> > After I did all that then I went ahead and created branches
> from that
> > trunk using svn copy https://../project/trunk https://../
> > project/branches/test1
> >
> > And everything is fine now.
>
> [snip]
>
> Except that your project is now disconnected from its history
> (svn log on the project will not be able to show anything
> earlier than this import). But if you meant to do that, and
> don't mind that everything that you imported is now stored as
> a full version and not as a delta against a previous
> revision, then everything's fine.
>
I just read this whole thread in horror (I was days behind). Perhaps I
missed something, but it was like watching a train wreck. The original
question, as I saw it, was "Given that I started development in
branch/test, I now want to 'merge' it to trunk (which is empty). How do
I do that?"
To me, the answer was "Move the contents of 'branch/test1' to 'trunk'.
Delete test1." Instead, I watched a horribly contorted series of
maneuvers that resulted in lost history. Did I miss something important
in this thread?
BTW JfK, if this is the only project in the repository, and you don't
care about the history, it would be better to replace your original
repository with a blank one, THEN import your project. If you wanted to
keep history, the solution in my second paragraph would have done the
trick.
--
David
*************************************************************************
This communication, including attachments, is
for the exclusive use of addressee and may contain proprietary,
confidential and/or privileged information. If you are not the intended
recipient, any use, copying, disclosure, dissemination or distribution is
strictly prohibited. If you are not the intended recipient, please notify
the sender immediately by return e-mail, delete this communication and
destroy all copies.
*************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 1 15:16:58 2007