Re: Branch copy to empty trunk (was Re: Fwd)

The point most have been making is that, to use the merge capabilities
as expected for typical 'branching' use, you want to make a branch as
a copy from the trunk because you want a useful ancestry.

That said, you should be able to do this first merge without issue and
without noticing ancestry - the same, as far as I understand the merge
mechanism, can't necessarily be said of subsequent merges.

Perhaps we're all guilty of trying to educate in proper procedure
rather than solving the immediate problem at hand (which would easily
be solved by removing the trunk and remaking the trunk as a copy of
the branch thus reversing the roles, ancestry-wise, of trunk and
branch).

--
Talden
On 9/29/07, Atwood, Robert C <r.atwood@imperial.ac.uk> wrote:
>
>  My experience is that what you want to try should work fine. In svn,
> (UNLIKE cvs)  in my understanding, there is not any special nature of
> the branches compared to non-branches or trunk. You can use them however
> you like. Your initial approach is unorthodox and seems to be confusing
> the other responders (they seem to not realize that you have an empty
> trunk though you did state that earlier)
> However, I also recommend trying it on a disposable test project, not an
> important one. When RTFM does not work, then SIAS (suck it and see :-/ )
> I have never so far gotten an unfixable situation using SVN, whereas I
> did have some problems with CVS eventually. If worried you can use the
> utility to dump the project in backup-form before trying any 'scary'
> operation, and reimport the project as described in 'migration' if
> things go  wrong.
>
>
> http://svnbook.red-bean.com/en/1.4/svn.reposadmin.maint.html#svn.reposad
> min.maint.migrate
>
> Robert
>
> Note: Using a descriptive subject in your question may help in the
> future :->
>
> > -----Original Message-----
> > From: JfK Viper [mailto:jfk.viper@gmail.com]
> > Sent: 28 September 2007 04:20
> > To: Talden
> > Cc: Srilakshmanan, Lakshman; users@subversion.tigris.org
> > Subject: Re: Fwd
> >
> > Sorry, but I still didn't get my answer.
> >
> > I remember how I started my branch.
> >
> > mkdir Project
> > cd Project
> > mkdir trunk
> > mkdir branches; cd branches; mkdir test
> > mkdir tags
> >
> > and then I did svn import of this file. So looks like I
> > should not have imported the test directory like this way.
> >
> > So, My question is can i copy that code to trunk as
> > /trunk/test now, and then wipe out the /test directory from
> > branch? and then create a new branch using svn cp svn cp
> > https://.../project/trunk/test
> > https://.../project/branches/test - creating a private branch
> > of /project/trunk
> >                                      svn cp
> > https://../project/trunk/test
> > https://../project/branches/test1 - creating a private branch
> > of /project/trunk
> >
> > Will that be ok  from then onwards ?
> >
> > Sorry for so many posts, and for not being able to understand
> > properly.
> >
> > Binod
> >
> >
> >
> >
> >
> >
> > On 9/27/07, Talden <talden@gmail.com> wrote:
> >
> >       You can start adding code in a branch.  The issue is
> > how you started
> >       the branch.  A branch should be created as a copy of trunk.
> >
> >       svn cp https://.../project/trunk
> >       https://.../project/branches/newBranch -m "Created newBranch in
> >       project"
> >
> >       Then you checkout the branch, make your changes and commit them.
> >
> >       Now you merge those changes back to the trunk using
> > 'svn log' on the
> >       branch to find the start of the revision range you want
> > to merge and
> >       then using that information in an 'svn merge' command.
> >
> >       --
> >       Talden
> >
> >
> >       On 9/28/07, JfK Viper < jfk.viper@gmail.com
> > <mailto:jfk.viper@gmail.com> > wrote:
> >       > Sorry Srilakhsman that I again sent my question in
> > your personal email,
> >       > directly. I have again posted to users group.
> >       >
> >       >  Sorry for create confusion,
> >       >
> >       > but the currently codes are in  /branch/test. ( I
> > knew that I should have
> >       > commited the code in /trunk and then branch it out from there,
> >       > but I thought I could always copy those files from
> > /branch/test to /trunk
> >       > and then start from there when i am really ready for it.)
> >       >
> >       > So what I am planning to do right now is , use svn copy
> >       > https://.../Project/branch/test
> > https://../Project/trunk/test ------
> >       >
> >       > and then
> >       > use svn delete ...<test> https://..../Project/branch
> >       > > /test
> >       > >
> >       > > Now my repository should have fresh start, and
> >       > >
> >       > > I can do svn copy https://.../Project/trunk/test
> >       > https://...Project/branch/test
> >       > >
> >       >                        svn copy
> >       > https://../Project/trunk/test
> >       > https://..Project/branch/test1
> >       > >
> >       >                         and so on to create new branches
> >       > out of the trunk.
> >       > > Do you think this will create any problem, in future ?
> >       > >
> >       > > I do not see any other alternative or good way to
> > deal with this.
> >       > >
> >       > > Any thoughts.
> >       >
> >       >
> >       >
> >
> >
> >
> >
>
> ---------------------------------------------------------------------
> 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