Hi,
Yes your plan below will work. But I am a bit confused as to why you
would create /project/trunk /project/branches & /project/tags. I thought
you already had this project setup ?
> What happens if I checkout all the files from /branch/test and then
remove all .svn files and then makedir /project
>
/trunk
>
/branches
>
/tags
> and then copy the code to /trunk folder and then do initial import
and then create branches.
An easier option would be to (I thought of this weekend)
cd project-trunk
svn merger -r 1:HEAD https://.../project/branch/test
You should be able to merge from branch "test" straight into trunk and
preserve ancestry
Thanks
Lakshman
________________________________
From: Binod [mailto:binod3@gmail.com]
Sent: Friday, 28 September 2007 5:26 PM
To: Srilakshmanan, Lakshman
Cc: JfK Viper; users@subversion.tigris.org
Subject: Re: Fwd
Nope I hadn't commited the working file to repository, and I guess thats
why I was getting other errors earlier.
Now when I try to commit using svn commit --force-log --file test
i get errors like svn: Log message contains a zero byte
In the mean time I also would want to know the consequences of plan that
I proposed earlier. I checkout all the files from repository. (remove
the .svn files)
Wipe out the whole project and create a new project, trunk, tag, branch
directory and put those files under trunk and do an initial import and
then branch it out. What will be the drawback of this approach? Any
thoughts ?
Today has been one of those days where I have been able to do inside out
practice only on subversion related commands and also been able to get
indepth knowledge on Merging procedure.
Very Very thanks to you SRILAKHSMAN.
On 9/28/07, Srilakshmanan, Lakshman
<lakshman.srilakshmanan@police.vic.gov.au > wrote:
I am assuming you have commited your working copy of
branch-initial into subversion.
cd project-trunk
svn merge -r 1329:HEAD https://.../project/branch/initial
________________________________
From: Binod [mailto:binod3@gmail.com]
Sent: Friday, 28 September 2007 4:41 PM
To: Srilakshmanan, Lakshman
Cc: JfK Viper; users@subversion.tigris.org
Subject: Re: Fwd
What happens if I checkout all the files from /branch/test and
then remove all .svn files and then makedir /project
/trunk
/branches
/tags
and then copy the code to /trunk folder and then do initial
import and then create branches.
This way I will have the latest stable code from /branches and
this will be the starting point.
Thanks
On 9/28/07, Binod <binod3@gmail.com> wrote:
Here is further information, if you can help on this,
that would be great.
bash-3.00$ svn log -v --stop-on-copy
svn://...../Project/branches/initial
------------------------------------------------------------------------
r1330 | svn | 2007-09-27 23:03:05 -0500 (Thu, 27 Sep
2007) | 1 line
Changed paths:
A /Project/branches/initial (from
/Project/trunk:1329)
creating initial project
bash-3.00$ svn log -v --stop-on-copy
https://..../Project/trunk
------------------------------------------------------------------------
r433 | bpandey | 2007-06-20 17:41:05 -0500 (Wed, 20 Jun
2007) | 1 line
Changed paths:
A /Project (from /Project:432)
D /Project
Renaming directory
Thanks,
========================================================================
========================
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.
========================================================================
========================
================================================================================================
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.
================================================================================================
Received on Mon Oct 1 01:38:03 2007