svn co https://.../project/trunk <https://.../project/trunk>
project-trunk
cd project-trunk
svn merge -r 1:HEAD https://.../project/branch/initial
<https://.../project/branch/initial>
svn commit
________________________________
From: Binod [mailto:binod3@gmail.com]
Sent: Friday, 28 September 2007 3:08 PM
To: Srilakshmanan, Lakshman
Cc: JfK Viper; users@subversion.tigris.org
Subject: Re: Fwd
After all done, now I am stuck at merge again.
I tried svn merge https://.../project/branch/initial
https://.../project/trunk ( I am weak at merge, as I never used this
command before) <https://.../project/trunk>
it doesnot do anything. I am guessing its because there is nothing in
trunk to see .
How do i do merge? I looked at svn redbook but I couldnot understand. It
only talks about merging revisions.... Can you simplify for me please?
Thanks in advance
On 9/27/07, Srilakshmanan, Lakshman
<lakshman.srilakshmanan@police.vic.gov.au > wrote:
1) rm -rf .svn in each directory
2) find dir -name .svn -type d | xargs -i rm -rf {}
________________________________
From: JfK Viper [mailto:jfk.viper@gmail.com]
Sent: Friday, 28 September 2007 2:43 PM
To: Srilakshmanan, Lakshman
Cc: users@subversion.tigris.org
Subject: Re: Fwd
I checked out the /branch/test from my version control and also
checked out /branch/initial.
I then copied the files and directories from /test to /initial.
As we all know those checkout files will have .svn folder inside
it, it gave me the warning sign of
"already under version control"
and then I ran the command
find dir -type d -name .svn -exec rm -rf {} \;
but i get the error
find: stat() error dir: No such file or directory
Do you know any other way to get rid of this error.
I was getting relieved to know I was so close to my solution and
now a new problem arises.
Any thoughts?
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 Fri Sep 28 07:19:03 2007