List Info

Thread: Fwd




Fwd
user name
2007-09-27 19:19:02


-Hi All,

I am newbie to subversion. I know this is very simple question but I couldn';t find answer in svn book and in forums.(Or may be i didn't understand, answer in as simple words as possible will be very helpful)

Ok after reading the book , I created

Project
         /trunk/
      ;   /branch/
    ;    /tag

After that I created various a new folder inside /branch as /branch/test

I added various files and so on in test. Now my code in /test folder is stable and I want to merge to /trunk folder as a stable code. How do I do it?
My /trunk folder is completely empty. Do I just copy everything inside /test to /trunk for the first time or do I do merge? If I do merge how do i do it?
And I should see /trunk/test after the merge, shouldn9;t I ? I went to /trunk folder and did merge command and I got no response and went inside to the trunk folder in svn server , and there is nothing as well as expected.

What am I missing?

Thanks in advance and sorry for such newbie question.



RE: Fwd
user name
2007-09-27 20:34:58
Hi JfK
 
You need to first create a /branch/test from /trunk using svn copy http://svnbook.red-bean.com/en/1.4/svn-book.html#svn.ref.svn.c.copy
1) svn copy          http://.../Projetc/trunk     ;   http://..../Project/branch/test
2) add your files to branch/test
3) use svn merge http://svnbook.red-bean.com/en/1.4/svn-book.html#svn.ref.svn.c.merge to merge the changes back into trunk
 
Hope this helps.
 
Thanks
Lakshman


From: JfK Viper [mailto:jfk.vipergmail.com]
Sent: Friday, 28 September 2007 10:19 AM
To: userssubversion.tigris.org
Subject: Fwd



-Hi All,

I am newbie to subversion. I know this is very simple question but I couldn't find answer in svn book and in forums.(Or may be i didn't understand, answer in as simple words as possible will be very helpful)

Ok after reading the book , I created

Project
         /trunk/
  ;       /branch/
        /tag

After that I created various a new folder inside /branch as /branch/test

I added various files and so on in test. Now my code in /test folder is stable and I want to merge to /trunk folder as a stable code. How do I do it?
My /trunk folder is completely empty. Do I just copy everything inside /test to /trunk for the first time or do I do merge? If I do merge how do i do it?
And I should see /trunk/test after the merge, shouldn't I ? I went to /trunk folder and did merge command and I got no response and went inside to the trunk folder in svn server , and there is nothing as well as expected.

What am I missing?

Thanks in advance and sorry for such newbie question.



================================================================================================
EMAIL DISCLAIMER

This email and any attachments are confidential. They may also be subject to copyright.

If you are not an intended recipient of this email please immediately contact us by replying
to this email and then delete this email. 

You must not read, use, copy, retain, forward or disclose this email or any attachment.

We do not accept any liability arising from or in connection with unauthorised use or disclosure 
of the information contained in this email or any attachment.

We make reasonable efforts to protect against computer viruses but we do not accept liability

for any liability, loss or damage caused by any computer virus contained in this email.
================================================================================================
Re: Fwd
user name
2007-09-27 21:07:42
Thanks for your  response, Srilakshman!

I understand what you are saying here, but my problem is that I have all my files in https://.../Project/branch/test and I don't have any thing in my https://.../Project/trunk. ( I didn't wanted to start from trunk, but rather wanted to have stable code in branch first , then add to trunk and then branch it out accordingly, and now I am little worried )

I want to put the files from https://../Project/branch/test in my https://...Project/trunk as https://...Project/trunk/test

This will be the stable code to start from. and I want to create new branches like https://.../Project/branch
/test1
    ;           ;           ;           ;           ;           ;           ;           ;           ;           ;           ;           ;           ;           ;    /test2

So do i do svn copy from https://../Project/branch/test to https://../Project/trunk/test to accomplish that ?

What will happen in future if I still keep the /branch/test ( the place where i copied the main stable code to the trunk, will i run into any problem)? I know subversion makes lazy copy so what happens if I do svn delete to the original branch from where I copied to my trunk? will by code be corrupted ?

I could not get those answers in forums or even in book.
I will really appreciate any help or information.
Thanks,


On 9/27/07, Srilakshmanan, Lakshman < lakshman.srilakshmananpolice.vic.gov.au">lakshman.srilakshmananpolice.vic.gov.au &gt; wrote:
Hi JfK
 
You need to first create a /branch/test from /trunk using svn copy http://svnbook.red-bean.com/en/1.4/svn-book.html#svn.ref.svn.c.copy
1) svn copy&nbsp; &nbsp; &nbsp; &nbsp;   http://.../Projetc/trunk &nbsp;   ; &nbsp; http://..../Project/branch/test
2) add your files to branch/test
3) use svn merge http://svnbook.red-bean.com/en/1.4/svn-book.html#svn.ref.svn.c.merge ;to merge the changes back into trunk
 
Hope this helps.
 
Thanks
Lakshman


From: JfK Viper [mailto: jfk.vipergmail.com" target="_blank" onclick="return top.js.OpenExtLink(window,event,this)">jfk.vipergmail.com]
Sent: Friday, 28 September 2007 10:19 AM
To: userssubversion.tigris.org" target="_blank" onclick="return top.js.OpenExtLink(window,event,this)">userssubversion.tigris.org
Subject: Fwd



-Hi All,

I am newbie to subversion. I know this is very simple question but I couldn';t find answer in svn book and in forums.(Or may be i didn't understand, answer in as simple words as possible will be very helpful)

Ok after reading the book , I created

Project
 &nbsp; &nbsp; &nbsp;   /trunk/
  ; &nbsp; &nbsp; &nbsp; /branch/
 &nbsp; &nbsp; &nbsp;  /tag

After that I created various a new folder inside /branch as /branch/test

I added various files and so on in test. Now my code in /test folder is stable and I want to merge to /trunk folder as a stable code. How do I do it?
My /trunk folder is completely empty. Do I just copy everything inside /test to /trunk for the first time or do I do merge? If I do merge how do i do it?
And I should see /trunk/test after the merge, shouldn9;t I ? I went to /trunk folder and did merge command and I got no response and went inside to the trunk folder in svn server , and there is nothing as well as expected.

What am I missing?

Thanks in advance and sorry for such newbie question.



================================================================================================
EMAIL DISCLAIMER

This email and any attachments are confidential. They may also be subject to copyright.

If you are not an intended recipient of this email please immediately contact us by replying
to this email and then delete this email.

You must not read, use, copy, retain, forward or disclose this email or any attachment.

We do not accept any liability arising from or in connection with unauthorised use or disclosure
of the information contained in this email or any attachment.

We make reasonable efforts to protect against computer viruses but we do not accept liability
for any liability, loss or damage caused by any computer virus contained in this email.
================================================================================================

[1-3]

about | contact  Other archives ( Real Estate discussion Medical topics )