On 28 Sep 2007, at 04:01, Talden 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.
You are like the helpful local who when asked for directions to get
to a certain town says "I wouldn't start from here". :-)
As I understand it, the issue is that JfK Viper *already* has his
code in a branch and an empty trunk. Telling him how he *should*
have begun is of no use.
I think the best way for him to get onto the "conventional track"
given that trunk is empty would be to
1. svn copy $PATH/branches/test $PATH/trunk
2. (Optional) svn delete $PATH/branches/test
Instead of step 2, he could continue to work on his test branch and
merge changes to trunk without problems.
>
> --
> Talden
>
>
> On 9/28/07, JfK Viper <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
Received on Fri Sep 28 10:41:45 2007