[prev in list] [next in list] [prev in thread] [next in thread]
List: subversion-users
Subject: RE: Fwd
From: "Srilakshmanan, Lakshman" <lakshman.srilakshmanan () police ! vic ! gov ! au>
Date: 2007-09-30 23:37:57
Message-ID: E3995ECF2DC95945A57101E6600C5BD905AA8D () PWWVH0302 ! vicpolice ! internal
[Download RAW message or body]
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.
================================================================================================
[Attachment #3 (text/html)]
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD>
<META http-equiv=Content-Type content="text/html; charset=us-ascii">
<META content="MSHTML 6.00.2900.3132" name=GENERATOR></HEAD>
<BODY>
<DIV dir=ltr align=left><SPAN class=057372423-30092007><FONT face=Arial
color=#0000ff size=2>Hi,</FONT></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=057372423-30092007><FONT face=Arial
color=#0000ff size=2></FONT></SPAN> </DIV>
<DIV dir=ltr align=left><SPAN class=057372423-30092007><FONT face=Arial
color=#0000ff size=2>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 ?</FONT></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=057372423-30092007><FONT face=Arial
color=#0000ff size=2></FONT></SPAN> </DIV>
<DIV dir=ltr align=left><SPAN class=057372423-30092007>
<DIV dir=ltr align=left>> What happens if I checkout all the files from
/branch/test and then remove all .svn files and then makedir
/project<BR>> &nbs \
p; \
&n \
bsp; &nbs \
p; \
&n \
bsp; &nbs \
p; \
&n \
bsp; &nbs \
p; \
/trunk
<BR>> \
&n \
bsp; &nbs \
p; \
&n \
bsp; &nbs \
p; \
&n \
bsp; &nbs \
p; \
\
/branches<BR>> &n \
bsp; &nbs \
p; \
&n \
bsp; &nbs \
p; \
&n \
bsp; &nbs \
p; \
&n \
bsp; \
/tags <BR><SPAN class=057372423-30092007><FONT face=Arial color=#0000ff
size=2><FONT face="Times New Roman" color=#000000 size=3>> </FONT> <FONT
face="Times New Roman" color=#000000 size=3>and then copy the code to /trunk
folder and then do initial import and then create
branches.</FONT><BR></FONT></SPAN></DIV>
<DIV dir=ltr align=left><FONT face=Arial color=#0000ff
size=2></FONT> </DIV></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=057372423-30092007><FONT face=Arial
color=#0000ff size=2>An easier option would be to (I thought of this
weekend)</FONT></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=057372423-30092007><FONT face=Arial
color=#0000ff size=2>cd project-trunk</FONT></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=057372423-30092007><FONT face=Arial
color=#0000ff size=2>svn merger -r 1:HEAD <SPAN><FONT
title="https://.../project/branch/initial " face="Times New Roman" size=3><A
href="https://.../project/branch/test">https://.../project/branch/test</A></FONT></SPAN></FONT></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=057372423-30092007><FONT face=Arial
color=#0000ff size=2><SPAN class=e id=q_1154ae81ec0b85b0_5><FONT
face="Times New Roman" color=#000000
size=3> </FONT></SPAN></FONT></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=057372423-30092007><FONT face=Arial
color=#0000ff size=2><SPAN class=e>You should be able to merge from branch
"test" straight into trunk and preserve ancestry</SPAN></FONT></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=057372423-30092007><FONT face=Arial
color=#0000ff size=2><SPAN class=e></SPAN></FONT></SPAN> </DIV>
<DIV dir=ltr align=left><SPAN class=057372423-30092007><FONT face=Arial
color=#0000ff size=2><SPAN class=e>Thanks</SPAN></FONT></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=057372423-30092007><FONT face=Arial
color=#0000ff size=2><SPAN class=e>Lakshman</SPAN></FONT></SPAN></DIV>
<DIV class=OutlookMessageHeader lang=en-us dir=ltr align=left>
<HR tabIndex=-1>
<FONT face=Tahoma size=2><B>From:</B> Binod [mailto:binod3@gmail.com]
<BR><B>Sent:</B> Friday, 28 September 2007 5:26 PM<BR><B>To:</B> Srilakshmanan,
Lakshman<BR><B>Cc:</B> JfK Viper; users@subversion.tigris.org<BR><B>Subject:</B>
Re: Fwd<BR></FONT><BR></DIV>
<DIV></DIV>Nope I hadn't commited the working file to repository, and I guess
thats why I was getting other errors earlier.<BR><BR>Now when I try to commit
using svn commit --force-log --file test<BR>i get errors like svn: Log message
contains a zero byte <BR><BR><BR>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)<BR><BR>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 ? <BR><BR>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.<BR><BR>Very Very thanks
to you SRILAKHSMAN. <BR><BR><BR><BR><BR>
<DIV><SPAN class=gmail_quote>On 9/28/07, <B
class=gmail_sendername>Srilakshmanan, Lakshman</B> <<A
href="mailto:lakshman.srilakshmanan@police.vic.gov.au">lakshman.srilakshmanan@police.vic.gov.au \
</A>> wrote:</SPAN>
<BLOCKQUOTE class=gmail_quote
style="PADDING-LEFT: 1ex; MARGIN: 0pt 0pt 0pt 0.8ex; BORDER-LEFT: rgb(204,204,204) \
1px solid"> <DIV>
<DIV dir=ltr align=left>
<DIV><FONT face=Arial color=#0000ff size=2><SPAN>I am assuming you have
commited your working copy of branch-initial into
subversion.</SPAN></FONT></DIV>
<DIV><FONT face=Arial color=#0000ff size=2><SPAN></SPAN></FONT> </DIV>
<DIV><FONT face=Arial color=#0000ff size=2><SPAN>cd
project-trunk</SPAN></FONT></DIV>
<DIV><FONT face=Arial><FONT size=2><FONT color=#0000ff>s<SPAN>vn merge -r
1<SPAN>329</SPAN>:HEAD <SPAN><A
title="https://.../project/branch/initial "><FONT
title="https://.../project/branch/initial " face="Times New Roman"
size=3>https://.../project/branch/initial
</FONT></A></SPAN></SPAN></FONT></FONT></FONT></DIV></DIV><BR>
<DIV lang=en-us dir=ltr align=left>
<HR>
<FONT face=Tahoma size=2><SPAN class=q><B>From:</B> Binod [mailto:<A
onclick="return top.js.OpenExtLink(window,event,this)"
href="mailto:binod3@gmail.com" target=_blank>binod3@gmail.com</A>]
<BR></SPAN><B>Sent:</B> Friday, 28 September 2007 4:41 PM<SPAN
class=q><BR><B>To:</B> Srilakshmanan, Lakshman<BR><B>Cc:</B> JfK Viper; <A
onclick="return top.js.OpenExtLink(window,event,this)"
href="mailto:users@subversion.tigris.org"
target=_blank>users@subversion.tigris.org</A><BR><B>Subject:</B> Re:
Fwd<BR></SPAN></FONT><BR></DIV>
<DIV><SPAN class=e id=q_1154ae81ec0b85b0_5>
<DIV></DIV>What happens if I checkout all the files from /branch/test
and then remove all .svn files and then makedir
/project<BR> \
&n \
bsp; &nbs \
p; \
&n \
bsp; &nbs \
p; \
&n \
bsp; &nbs \
p; \
\
/trunk
<BR> &n \
bsp; &nbs \
p; \
&n \
bsp; &nbs \
p; \
&n \
bsp; &nbs \
p; \
&n \
bsp; \
/branches<BR>   \
; & \
nbsp; &nb \
sp;   \
; & \
nbsp; &nb \
sp;   \
; & \
nbsp; &nb \
sp;   \
; \
/tags <BR><BR>and then copy the code to /trunk folder and then do initial
import and then create branches.<BR>This way I will have the latest stable
code from /branches and this will be the starting
point.<BR><BR>Thanks<BR><BR><BR>
<DIV><SPAN class=gmail_quote>On 9/28/07, <B class=gmail_sendername>Binod</B>
<<A onclick="return top.js.OpenExtLink(window,event,this)"
href="mailto:binod3@gmail.com" target=_blank>binod3@gmail.com</A>>
wrote:</SPAN>
<BLOCKQUOTE class=gmail_quote
style="PADDING-LEFT: 1ex; MARGIN: 0pt 0pt 0pt 0.8ex; BORDER-LEFT: rgb(204,204,204) \
1px solid">Here is further information, if you can help on this, that would be
great.<BR><BR>bash-3.00$ svn log -v --stop-on-copy
svn://...../Project/branches/initial<BR>------------------------------------------------------------------------ \
<BR>r1330 | svn | 2007-09-27 23:03:05 -0500 (Thu, 27 Sep 2007) | 1
line<BR>Changed paths:<BR> A /Project/branches/initial (from
/Project/trunk:1329)<BR><BR>creating initial project<BR><BR><BR>bash-3.00$
svn log -v --stop-on-copy
https://..../Project/trunk
<BR>------------------------------------------------------------------------<BR>r433 \
| bpandey | 2007-06-20 17:41:05 -0500 (Wed, 20 Jun 2007) | 1 line
<BR>Changed paths:<BR> A /Project (from
/Project:432)<BR> D /Project<BR><BR>Renaming
directory<BR><BR>Thanks,<BR><BR><BR><BR>
<DIV><SPAN
class=gmail_quote><BR></SPAN></DIV><BR></BLOCKQUOTE></DIV><BR></SPAN></DIV><PRE><SPAN \
class=q> ================================================================================================<BR>EMAIL \
DISCLAIMER<BR><BR>This email and any attachments are confidential. They may also be \
subject to copyright.<BR><BR>If you are not an intended recipient of this email \
please immediately contact us by replying <BR>to this email and then delete this \
email. <BR><BR>You must not read, use, copy, retain, forward or disclose this email \
or any attachment.<BR><BR>We do not accept any liability arising from or in \
connection with unauthorised use or disclosure <BR>of the information contained in \
this email or any attachment.<BR><BR>We make reasonable efforts to protect against \
computer viruses but we do not accept liability<BR>for any liability, loss or damage \
caused by any computer virus contained in this email. \
<BR>================================================================================================<BR></SPAN></PRE></DIV></BLOCKQUOTE></DIV><BR><pre>
================================================================================================
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. ================================================================================================
</pre></BODY></HTML>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic