You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Jeff Lanzarotta <de...@yahoo.com> on 2007/11/15 15:20:52 UTC
Branching question
Hello,
I have a question on branching.
I currently have a file, let's say foo.exe, checked into an svn repository. My repository is set up with the typical trunk, branches, and tags layout. The file foo.exe is checked into the trunk. foo.exe has several revision against it, 1, 2, and 3 with 3 being the HEAD.
Here is the question, can I move revisions 2 and 3 into a branch and make 1 the HEAD again? The powers at be do not want the changes that are in revisions 2 and 3 until sometime next year, so they want revert back to revision 1 as the HEAD. Is this possible or is there a different way to do it...
Thanks.
-Jeff
-Jeff
RE: Branching question
Posted by Ian Wood <Ia...@sucden.co.uk>.
Hi Jeff,
Maybe you could
* Take a branch at revision 3, making revision 4
* Update the file to revision 1 and then commit that, meaning it
will now be at revision 5, but effectively the same as revision 1.
Hope you get it sorted,
Best regards,
Ian
________________________________
From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
Sent: 15 November 2007 15:21
To: Subversion Mailing List
Subject: Branching question
Hello,
I have a question on branching.
I currently have a file, let's say foo.exe, checked into an svn
repository. My repository is set up with the typical trunk, branches,
and tags layout. The file foo.exe is checked into the trunk. foo.exe
has several revision against it, 1, 2, and 3 with 3 being the HEAD.
Here is the question, can I move revisions 2 and 3 into a branch and
make 1 the HEAD again? The powers at be do not want the changes that
are in revisions 2 and 3 until sometime next year, so they want revert
back to revision 1 as the HEAD. Is this possible or is there a
different way to do it...
Thanks.
-Jeff
-Jeff
www.sucden.co.uk
Sucden (UK) Limited, 5 London Bridge Street, London SE1 9SG
Telephone +44 20 7940 9400
Registered in England no. 1095841
VAT registration no. GB 446 9061 33
Authorised and Regulated by the Financial Services Authority (FSA) and entered in the FSA register under no. 114239
This email, including any files transmitted with it, is confidential and may be privileged. It may be read, copied and used only by the intended recipient. If you are not the intended recipient of this message, please notify postmaster@sucden.co.uk immediately and delete it from your computer system.
We believe, but do not warrant, that this email and its attachments are virus-free, but you should check.
Sucden (UK) Ltd may monitor traffic data of both business and personal emails. By replying to this email, you consent to Sucden?s monitoring the content of any emails you send to or receive from Sucden. Sucden is not liable for any opinions expressed by the sender where this is a non-business email.
The contents of this e-mail do not constitute advice and should not be regarded as a recommendation to buy, sell or otherwise deal with any particular investment.
This message has been scanned for viruses by BlackSpider MailControl
RE: RE: Branching question
Posted by km...@rockwellcollins.com.
"Ian Wood" <Ia...@sucden.co.uk> wrote on 11/16/2007 04:20:18 AM:
> Sorry to have caused any confusion?
>
> I meant remove the file from the working copy only ? NOT a SVN Delete.
>
> Doing a SVN Delete will lose the history and it would be shame to do
that.
Doing a SVN delete will not "lose" the history, but it does make it harder
to see the history using the standard subversion commands without
using/knowing
the peg revision number... I haven't checked to be sure, but something
like the TortoiseSVN revision graph should show the abandoned path and
it's history.
Kevin R.
>
>
> From: Reedick, Andrew [mailto:jr9445@att.com]
> Sent: 15 November 2007 17:19
> To: delux256-subversion@yahoo.com; Ian Wood; Subversion Mailing List
> Subject: RE: RE: Branching question
>
> The delete and re-copy is "easy" but you will lose the history
> associated with the original 162. Besides, it would behoove you to
> learn/practice how to merge.
>
> You can use 'svn copy -r 162 svn://path/to/file current_workspace'
> to replace the HEAD with the old version.
>
>
>
>
> From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
> Sent: Thursday, November 15, 2007 12:14 PM
> To: Ian Wood; Reedick, Andrew; Subversion Mailing List
> Subject: RE: RE: Branching question
> I am using TortoiseSVN. You are correct in that I check it back in,
> the version number is the HEAD... Also, each of the revision have
> other files in them.
>
> So, maybe the easiest way would be like you said, to delete the
> file, update to revision 162. But, can I get 162 back into the truck?
>
> Ian Wood <Ia...@sucden.co.uk> wrote:
> At least with TortoiseSVN?It may be easier to delete the working
> copy and then update it to the revision required.
> <!--[if !supportLists]-->Ø <!--[endif]-->Do I need to so an
> "unmerge" for each revision, i.e. unmerge 195, unmerge 193, unmerge
> 191, and unmerge 187, which will get me to 162?
> Doing this would get you to what the file was at revision 162, but
> when you commit that it will take the revision number of the Head.
> Cheers
> Ian
>
> From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
> Sent: 15 November 2007 16:40
> To: Reedick, Andrew; Subversion Mailing List
> Subject: RE: Branching question
> Interesting... What if I need to go back 4 revisions... The current
> revision number is 195 and revision I need to get to is 162...
>
> Do I need to so an "unmerge" for each revision, i.e. unmerge 195,
> unmerge 193, unmerge 191, and unmerge 187, which will get me to 162?
>
> "Reedick, Andrew" <jr...@ATT.COM> wrote:
>
> > From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
> > Sent: Thursday, November 15, 2007 10:21 AM
> > To: Subversion Mailing List
> > Subject: Branching question
> >
> > I currently have a file, let's say foo.exe, checked into an svn
> > repository. My repository is set up with the typical trunk,
> > branches, and tags layout. The file foo.exe is checked into
> > the trunk. foo.exe has several revision against it, 1, 2, and
> > 3 with 3 being the HEAD.
> >
> > Here is the question, can I move revisions 2 and 3 into a branch
> > and make 1 the HEAD again? The powers at be do not want the
> > changes that are in revisions 2 and 3 until sometime next year,
> > so they want revert back to revision 1 as the HEAD. Is this
> > possible or is there a different way to do it...
>
>
> 1. Create next_year_branch from revision 3.
>
> 2. On the trunk, unmerge (do a reverse merge) revisions 2 and 3. Refer
> to "Undoing Changes" in
> http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
> www.sucden.co.uk
> Sucden (UK) Limited, 5 London Bridge Street, London SE1 9SG
> Telephone +44 20 7940 9400
>
> Registered in England no. 1095841
> VAT registration no. GB 446 9061 33
> Authorised and Regulated by the Financial Services Authority (FSA)
> and entered in the FSA register under no. 114239
> This email, including any files transmitted with it, is confidential
> and may be privileged. It may be read, copied and used only by the
> intended recipient. If you are not the intended recipient of this
> message, please notify postmaster@sucden.co.uk immediately and
> delete it from your computer system.
> We believe, but do not warrant, that this email and its attachments
> are virus-free, but you should check.
> Sucden (UK) Ltd may monitor traffic data of both business and
> personal emails. By replying to this email, you consent to Sucden's
> monitoring the content of any emails you send to or receive from
> Sucden. Sucden is not liable for any opinions expressed by the
> sender where this is a non-business email.
> The contents of this e-mail do not constitute advice and should not
> be regarded as a recommendation to buy, sell or otherwise deal with
> any particular investment.
> This message has been scanned for viruses by BlackSpider MailControl
>
>
> www.sucden.co.uk
> Sucden (UK) Limited, 5 London Bridge Street, London SE1 9SG
> Telephone +44 20 7940 9400
>
> Registered in England no. 1095841
> VAT registration no. GB 446 9061 33
> Authorised and Regulated by the Financial Services Authority (FSA)
> and entered in the FSA register under no. 114239
>
> This email, including any files transmitted with it, is confidential
> and may be privileged. It may be read, copied and used only by the
> intended recipient. If you are not the intended recipient of this
> message, please notify postmaster@sucden.co.uk immediately and
> delete it from your computer system.
>
> We believe, but do not warrant, that this email and its attachments
> are virus-free, but you should check.
>
> Sucden (UK) Ltd may monitor traffic data of both business and
> personal emails. By replying to this email, you consent to Sucden's
> monitoring the content of any emails you send to or receive from
> Sucden. Sucden is not liable for any opinions expressed by the
> sender where this is a non-business email.
> The contents of this e-mail do not constitute advice and should not
> be regarded as a recommendation to buy, sell or otherwise deal with
> any particular investment.
> This message has been scanned for viruses by BlackSpider MailControl
> *****
> The information transmitted is intended only for the person or
> entity to which it is addressed and may contain confidential,
> proprietary, and/or privileged material. Any review, retransmission,
> dissemination or other use of, or taking of any action in reliance
> upon this information by persons or entities other than the intended
> recipient is prohibited. If you received this in error, please
> contact the sender and delete the material from all computers. GA625
RE: RE: Branching question
Posted by Ian Wood <Ia...@sucden.co.uk>.
Sorry to have caused any confusion...
I meant remove the file from the working copy only - NOT a SVN Delete.
Doing a SVN Delete will lose the history and it would be shame to do
that.
________________________________
From: Reedick, Andrew [mailto:jr9445@att.com]
Sent: 15 November 2007 17:19
To: delux256-subversion@yahoo.com; Ian Wood; Subversion Mailing List
Subject: RE: RE: Branching question
The delete and re-copy is "easy" but you will lose the history
associated with the original 162. Besides, it would behoove you to
learn/practice how to merge.
You can use 'svn copy -r 162 svn://path/to/file current_workspace' to
replace the HEAD with the old version.
________________________________
From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
Sent: Thursday, November 15, 2007 12:14 PM
To: Ian Wood; Reedick, Andrew; Subversion Mailing List
Subject: RE: RE: Branching question
I am using TortoiseSVN. You are correct in that I check it back
in, the version number is the HEAD... Also, each of the revision have
other files in them.
So, maybe the easiest way would be like you said, to delete the
file, update to revision 162. But, can I get 162 back into the truck?
Ian Wood <Ia...@sucden.co.uk> wrote:
At least with TortoiseSVN...It may be easier to delete the
working copy and then update it to the revision required.
<!--[if !supportLists]-->* <!--[endif]-->Do I need to so
an "unmerge" for each revision, i.e. unmerge 195, unmerge 193, unmerge
191, and unmerge 187, which will get me to 162?
Doing this would get you to what the file was at revision 162,
but when you commit that it will take the revision number of the Head.
Cheers
Ian
________________________________
From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
Sent: 15 November 2007 16:40
To: Reedick, Andrew; Subversion Mailing List
Subject: RE: Branching question
Interesting... What if I need to go back 4 revisions... The
current revision number is 195 and revision I need to get to is 162...
Do I need to so an "unmerge" for each revision, i.e. unmerge
195, unmerge 193, unmerge 191, and unmerge 187, which will get me to
162?
"Reedick, Andrew" <jr...@ATT.COM> wrote:
> From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
> Sent: Thursday, November 15, 2007 10:21 AM
> To: Subversion Mailing List
> Subject: Branching question
>
> I currently have a file, let's say foo.exe, checked into an
svn
> repository. My repository is set up with the typical trunk,
> branches, and tags layout. The file foo.exe is checked into
> the trunk. foo.exe has several revision against it, 1, 2, and
> 3 with 3 being the HEAD.
>
> Here is the question, can I move revisions 2 and 3 into a
branch
> and make 1 the HEAD again? The powers at be do not want the
> changes that are in revisions 2 and 3 until sometime next
year,
> so they want revert back to revision 1 as the HEAD. Is this
> possible or is there a different way to do it...
1. Create next_year_branch from revision 3.
2. On the trunk, unmerge (do a reverse merge) revisions 2 and 3.
Refer
to "Undoing Changes" in
http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail:
users-help@subversion.tigris.org
www.sucden.co.uk <http://www.sucden.co.uk/>
Sucden (UK) Limited, 5 London Bridge Street, London SE1 9SG
Telephone +44 20 7940 9400
Registered in England no. 1095841
VAT registration no. GB 446 9061 33
Authorised and Regulated by the Financial Services Authority
(FSA) and entered in the FSA register under no. 114239
This email, including any files transmitted with it, is
confidential and may be privileged. It may be read, copied and used only
by the intended recipient. If you are not the intended recipient of this
message, please notify postmaster@sucden.co.uk immediately and delete it
from your computer system.
We believe, but do not warrant, that this email and its
attachments are virus-free, but you should check.
Sucden (UK) Ltd may monitor traffic data of both business and
personal emails. By replying to this email, you consent to Sucden's
monitoring the content of any emails you send to or receive from Sucden.
Sucden is not liable for any opinions expressed by the sender where this
is a non-business email.
The contents of this e-mail do not constitute advice and should
not be regarded as a recommendation to buy, sell or otherwise deal with
any particular investment.
This message has been scanned for viruses by BlackSpider
MailControl <http://www.blackspider.com/>
*****
The information transmitted is intended only for the person or entity to
which it is addressed and may contain confidential, proprietary, and/or
privileged material. Any review, retransmission, dissemination or other
use of, or taking of any action in reliance upon this information by
persons or entities other than the intended recipient is prohibited. If
you received this in error, please contact the sender and delete the
material from all computers. GA625
RE: RE: Branching question
Posted by "Reedick, Andrew" <jr...@ATT.COM>.
Subversion stores binaries as deltas. As long as there are no merge
conflicts (and there won't be since this case is a single line of
ancestry) svn should be able to unmerge without requring any editing.
But I don't think I've actually had to unmerge a binary file yet, so I
could be wrong.
RE: RE: Branching question
Posted by Jeff Lanzarotta <de...@yahoo.com>.
I would love to be able to use merge, but the code is in binary files. You are not actually able to edit the files without first opening them in the development environment...
"Reedick, Andrew" <jr...@ATT.COM> wrote: The delete and re-copy is "easy" but you will lose the history associated with the original 162. Besides, it would behoove you to learn/practice how to merge.
You can use 'svn copy -r 162 svn://path/to/file current_workspace' to replace the HEAD with the old version.
---------------------------------
From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
Sent: Thursday, November 15, 2007 12:14 PM
To: Ian Wood; Reedick, Andrew; Subversion Mailing List
Subject: RE: RE: Branching question
I am using TortoiseSVN. You are correct in that I check it back in, the version number is the HEAD... Also, each of the revision have other files in them.
So, maybe the easiest way would be like you said, to delete the file, update to revision 162. But, can I get 162 back into the truck?
Ian Wood <Ia...@sucden.co.uk> wrote: v\:* { BEHAVIOR: url(#default#VML) } o\:* { BEHAVIOR: url(#default#VML) } w\:* { BEHAVIOR: url(#default#VML) } .shape { BEHAVIOR: url(#default#VML) } @font-face { font-family: Wingdings; } @font-face { font-family: Tahoma; } @page Section1 {size: 595.3pt 841.9pt; margin: 72.0pt 90.0pt 72.0pt 90.0pt; } P.MsoNormal { FONT-SIZE: 12pt; MARGIN: 0cm 0cm 0pt; FONT-FAMILY: "Times New Roman" } LI.MsoNormal { FONT-SIZE: 12pt; MARGIN: 0cm 0cm 0pt; FONT-FAMILY: "Times New Roman" } DIV.MsoNormal { FONT-SIZE: 12pt; MARGIN: 0cm 0cm 0pt; FONT-FAMILY: "Times New Roman" } A:link { COLOR: blue; TEXT-DECORATION: underline } SPAN.MsoHyperlink { COLOR: blue; TEXT-DECORATION: underline } A:visited { COLOR: purple; TEXT-DECORATION: underline } SPAN.MsoHyperlinkFollowed { COLOR: purple; TEXT-DECORATION: underline } SPAN.EmailStyle17 { COLOR: navy; FONT-FAMILY: Arial; mso-style-type: personal-reply } DIV.Section1 { page:
Section1 } OL { MARGIN-BOTTOM: 0cm } UL { MARGIN-BOTTOM: 0cm } At least with TortoiseSVN
It may be easier to delete the working copy and then update it to the revision required.
<!--[if !supportLists]-->Ø <!--[endif]-->Do I need to so an "unmerge" for each revision, i.e. unmerge 195, unmerge 193, unmerge 191, and unmerge 187, which will get me to 162?
Doing this would get you to what the file was at revision 162, but when you commit that it will take the revision number of the Head.
Cheers
Ian
---------------------------------
From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
Sent: 15 November 2007 16:40
To: Reedick, Andrew; Subversion Mailing List
Subject: RE: Branching question
Interesting... What if I need to go back 4 revisions... The current revision number is 195 and revision I need to get to is 162...
Do I need to so an "unmerge" for each revision, i.e. unmerge 195, unmerge 193, unmerge 191, and unmerge 187, which will get me to 162?
"Reedick, Andrew" <jr...@ATT.COM> wrote:
> From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
> Sent: Thursday, November 15, 2007 10:21 AM
> To: Subversion Mailing List
> Subject: Branching question
>
> I currently have a file, let's say foo.exe, checked into an svn
> repository. My repository is set up with the typical trunk,
> branches, and tags layout. The file foo.exe is checked into
> the trunk. foo.exe has several revision against it, 1, 2, and
> 3 with 3 being the HEAD.
>
> Here is the question, can I move revisions 2 and 3 into a branch
> and make 1 the HEAD again? The powers at be do not want the
> changes that are in revisions 2 and 3 until sometime next year,
> so they want revert back to revision 1 as the HEAD. Is this
> possible or is there a different way to do it...
1. Create next_year_branch from revision 3.
2. On the trunk, unmerge (do a reverse merge) revisions 2 and 3. Refer
to "Undoing Changes" in
http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
www.sucden.co.uk
Sucden (UK) Limited, 5 London Bridge Street, London SE1 9SG
Telephone +44 20 7940 9400
Registered in England no. 1095841
VAT registration no. GB 446 9061 33
Authorised and Regulated by the Financial Services Authority (FSA) and entered in the FSA register under no. 114239
This email, including any files transmitted with it, is confidential and may be privileged. It may be read, copied and used only by the intended recipient. If you are not the intended recipient of this message, please notify postmaster@sucden.co.uk immediately and delete it from your computer system.
We believe, but do not warrant, that this email and its attachments are virus-free, but you should check.
Sucden (UK) Ltd may monitor traffic data of both business and personal emails. By replying to this email, you consent to Sucden's monitoring the content of any emails you send to or receive from Sucden. Sucden is not liable for any opinions expressed by the sender where this is a non-business email.
The contents of this e-mail do not constitute advice and should not be regarded as a recommendation to buy, sell or otherwise deal with any particular investment.
This message has been scanned for viruses by BlackSpider MailControl
*****
The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA625
RE: RE: Branching question
Posted by "Reedick, Andrew" <jr...@ATT.COM>.
The delete and re-copy is "easy" but you will lose the history
associated with the original 162. Besides, it would behoove you to
learn/practice how to merge.
You can use 'svn copy -r 162 svn://path/to/file current_workspace' to
replace the HEAD with the old version.
________________________________
From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
Sent: Thursday, November 15, 2007 12:14 PM
To: Ian Wood; Reedick, Andrew; Subversion Mailing List
Subject: RE: RE: Branching question
I am using TortoiseSVN. You are correct in that I check it back
in, the version number is the HEAD... Also, each of the revision have
other files in them.
So, maybe the easiest way would be like you said, to delete the
file, update to revision 162. But, can I get 162 back into the truck?
Ian Wood <Ia...@sucden.co.uk> wrote:
At least with TortoiseSVN...It may be easier to delete
the working copy and then update it to the revision required.
<!--[if !supportLists]-->* <!--[endif]-->Do I need
to so an "unmerge" for each revision, i.e. unmerge 195, unmerge 193,
unmerge 191, and unmerge 187, which will get me to 162?
Doing this would get you to what the file was at
revision 162, but when you commit that it will take the revision number
of the Head.
Cheers
Ian
________________________________
From: Jeff Lanzarotta
[mailto:delux256-subversion@yahoo.com]
Sent: 15 November 2007 16:40
To: Reedick, Andrew; Subversion Mailing List
Subject: RE: Branching question
Interesting... What if I need to go back 4 revisions...
The current revision number is 195 and revision I need to get to is
162...
Do I need to so an "unmerge" for each revision, i.e.
unmerge 195, unmerge 193, unmerge 191, and unmerge 187, which will get
me to 162?
"Reedick, Andrew" <jr...@ATT.COM> wrote:
> From: Jeff Lanzarotta
[mailto:delux256-subversion@yahoo.com]
> Sent: Thursday, November 15, 2007 10:21 AM
> To: Subversion Mailing List
> Subject: Branching question
>
> I currently have a file, let's say foo.exe, checked
into an svn
> repository. My repository is set up with the typical
trunk,
> branches, and tags layout. The file foo.exe is checked
into
> the trunk. foo.exe has several revision against it, 1,
2, and
> 3 with 3 being the HEAD.
>
> Here is the question, can I move revisions 2 and 3
into a branch
> and make 1 the HEAD again? The powers at be do not
want the
> changes that are in revisions 2 and 3 until sometime
next year,
> so they want revert back to revision 1 as the HEAD. Is
this
> possible or is there a different way to do it...
1. Create next_year_branch from revision 3.
2. On the trunk, unmerge (do a reverse merge) revisions
2 and 3. Refer
to "Undoing Changes" in
http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html
---------------------------------------------------------------------
To unsubscribe, e-mail:
users-unsubscribe@subversion.tigris.org
For additional commands, e-mail:
users-help@subversion.tigris.org
www.sucden.co.uk <http://www.sucden.co.uk/>
Sucden (UK) Limited, 5 London Bridge Street, London SE1
9SG
Telephone +44 20 7940 9400
Registered in England no. 1095841
VAT registration no. GB 446 9061 33
Authorised and Regulated by the Financial Services
Authority (FSA) and entered in the FSA register under no. 114239
This email, including any files transmitted with it, is
confidential and may be privileged. It may be read, copied and used only
by the intended recipient. If you are not the intended recipient of this
message, please notify postmaster@sucden.co.uk immediately and delete it
from your computer system.
We believe, but do not warrant, that this email and its
attachments are virus-free, but you should check.
Sucden (UK) Ltd may monitor traffic data of both
business and personal emails. By replying to this email, you consent to
Sucden's monitoring the content of any emails you send to or receive
from Sucden. Sucden is not liable for any opinions expressed by the
sender where this is a non-business email.
The contents of this e-mail do not constitute advice and
should not be regarded as a recommendation to buy, sell or otherwise
deal with any particular investment.
This message has been scanned for viruses by BlackSpider
MailControl <http://www.blackspider.com/>
*****
The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA625
RE: RE: Branching question
Posted by Jeff Lanzarotta <de...@yahoo.com>.
I am using TortoiseSVN. You are correct in that I check it back in, the version number is the HEAD... Also, each of the revision have other files in them.
So, maybe the easiest way would be like you said, to delete the file, update to revision 162. But, can I get 162 back into the truck?
Ian Wood <Ia...@sucden.co.uk> wrote: v\:* {behavior:url(#default#VML);} o\:* {behavior:url(#default#VML);} w\:* {behavior:url(#default#VML);} .shape {behavior:url(#default#VML);} At least with TortoiseSVN
It may be easier to delete the working copy and then update it to the revision required.
Ø Do I need to so an "unmerge" for each revision, i.e. unmerge 195, unmerge 193, unmerge 191, and unmerge 187, which will get me to 162?
Doing this would get you to what the file was at revision 162, but when you commit that it will take the revision number of the Head.
Cheers
Ian
---------------------------------
From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
Sent: 15 November 2007 16:40
To: Reedick, Andrew; Subversion Mailing List
Subject: RE: Branching question
Interesting... What if I need to go back 4 revisions... The current revision number is 195 and revision I need to get to is 162...
Do I need to so an "unmerge" for each revision, i.e. unmerge 195, unmerge 193, unmerge 191, and unmerge 187, which will get me to 162?
"Reedick, Andrew" <jr...@ATT.COM> wrote:
> From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
> Sent: Thursday, November 15, 2007 10:21 AM
> To: Subversion Mailing List
> Subject: Branching question
>
> I currently have a file, let's say foo.exe, checked into an svn
> repository. My repository is set up with the typical trunk,
> branches, and tags layout. The file foo.exe is checked into
> the trunk. foo.exe has several revision against it, 1, 2, and
> 3 with 3 being the HEAD.
>
> Here is the question, can I move revisions 2 and 3 into a branch
> and make 1 the HEAD again? The powers at be do not want the
> changes that are in revisions 2 and 3 until sometime next year,
> so they want revert back to revision 1 as the HEAD. Is this
> possible or is there a different way to do it...
1. Create next_year_branch from revision 3.
2. On the trunk, unmerge (do a reverse merge) revisions 2 and 3. Refer
to "Undoing Changes" in
http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
www.sucden.co.uk
Sucden (UK) Limited, 5 London Bridge Street, London SE1 9SG
Telephone +44 20 7940 9400
Registered in England no. 1095841
VAT registration no. GB 446 9061 33
Authorised and Regulated by the Financial Services Authority (FSA) and entered in the FSA register under no. 114239
This email, including any files transmitted with it, is confidential and may be privileged. It may be read, copied and used only by the intended recipient. If you are not the intended recipient of this message, please notify postmaster@sucden.co.uk immediately and delete it from your computer system.
We believe, but do not warrant, that this email and its attachments are virus-free, but you should check.
Sucden (UK) Ltd may monitor traffic data of both business and personal emails. By replying to this email, you consent to Sucden's monitoring the content of any emails you send to or receive from Sucden. Sucden is not liable for any opinions expressed by the sender where this is a non-business email.
The contents of this e-mail do not constitute advice and should not be regarded as a recommendation to buy, sell or otherwise deal with any particular investment.
This message has been scanned for viruses by BlackSpider MailControl
RE: RE: Branching question
Posted by Ian Wood <Ia...@sucden.co.uk>.
At least with TortoiseSVN...It may be easier to delete the working copy
and then update it to the revision required.
* Do I need to so an "unmerge" for each revision, i.e. unmerge
195, unmerge 193, unmerge 191, and unmerge 187, which will get me to
162?
Doing this would get you to what the file was at revision 162, but when
you commit that it will take the revision number of the Head.
Cheers
Ian
________________________________
From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
Sent: 15 November 2007 16:40
To: Reedick, Andrew; Subversion Mailing List
Subject: RE: Branching question
Interesting... What if I need to go back 4 revisions... The current
revision number is 195 and revision I need to get to is 162...
Do I need to so an "unmerge" for each revision, i.e. unmerge 195,
unmerge 193, unmerge 191, and unmerge 187, which will get me to 162?
"Reedick, Andrew" <jr...@ATT.COM> wrote:
> From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
> Sent: Thursday, November 15, 2007 10:21 AM
> To: Subversion Mailing List
> Subject: Branching question
>
> I currently have a file, let's say foo.exe, checked into an svn
> repository. My repository is set up with the typical trunk,
> branches, and tags layout. The file foo.exe is checked into
> the trunk. foo.exe has several revision against it, 1, 2, and
> 3 with 3 being the HEAD.
>
> Here is the question, can I move revisions 2 and 3 into a branch
> and make 1 the HEAD again? The powers at be do not want the
> changes that are in revisions 2 and 3 until sometime next year,
> so they want revert back to revision 1 as the HEAD. Is this
> possible or is there a different way to do it...
1. Create next_year_branch from revision 3.
2. On the trunk, unmerge (do a reverse merge) revisions 2 and 3. Refer
to "Undoing Changes" in
http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
www.sucden.co.uk
Sucden (UK) Limited, 5 London Bridge Street, London SE1 9SG
Telephone +44 20 7940 9400
Registered in England no. 1095841
VAT registration no. GB 446 9061 33
Authorised and Regulated by the Financial Services Authority (FSA) and entered in the FSA register under no. 114239
This email, including any files transmitted with it, is confidential and may be privileged. It may be read, copied and used only by the intended recipient. If you are not the intended recipient of this message, please notify postmaster@sucden.co.uk immediately and delete it from your computer system.
We believe, but do not warrant, that this email and its attachments are virus-free, but you should check.
Sucden (UK) Ltd may monitor traffic data of both business and personal emails. By replying to this email, you consent to Sucden?s monitoring the content of any emails you send to or receive from Sucden. Sucden is not liable for any opinions expressed by the sender where this is a non-business email.
The contents of this e-mail do not constitute advice and should not be regarded as a recommendation to buy, sell or otherwise deal with any particular investment.
This message has been scanned for viruses by BlackSpider MailControl
Re: Branching question
Posted by Hari Kodungallur <hk...@gmail.com>.
On Nov 15, 2007 8:40 AM, Jeff Lanzarotta <de...@yahoo.com>
wrote:
> Interesting... What if I need to go back 4 revisions... The current
> revision number is 195 and revision I need to get to is 162...
>
> Do I need to so an "unmerge" for each revision, i.e. unmerge 195, unmerge
> 193, unmerge 191, and unmerge 187, which will get me to 162?
No, you don't need to individually unmerge each revision. Update your
working copy of the trunk to the latest and then just execute this command
in that directory:
svn merge -rHEAD:163 <trunk-repository-url>
This will reverse merge all the revision and get you back to where you were
at revision 162. Just verify (using svn diff and such) that the merge did
indeed merge back all the changes from 163 to 195 (or HEAD) and commit the
changes.
I prefer this method to getting a copy of the trunk at revision 162 and then
overlaying the working copy with it.
>
>
> *"Reedick, Andrew" <jr...@ATT.COM>* wrote:
>
>
> > From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
> > Sent: Thursday, November 15, 2007 10:21 AM
> > To: Subversion Mailing List
> > Subject: Branching question
> >
> > I currently have a file, let's say foo.exe, checked into an svn
> > repository. My repository is set up with the typical trunk,
> > branches, and tags layout. The file foo.exe is checked into
> > the trunk. foo.exe has several revision against it, 1, 2, and
> > 3 with 3 being the HEAD.
> >
> > Here is the question, can I move revisions 2 and 3 into a branch
> > and make 1 the HEAD again? The powers at be do not want the
> > changes that are in revisions 2 and 3 until sometime next year,
> > so they want revert back to revision 1 as the HEAD. Is this
> > possible or is there a different way to do it...
>
>
> 1. Create next_year_branch from revision 3.
>
> 2. On the trunk, unmerge (do a reverse merge) revisions 2 and 3. Refer
> to "Undoing Changes" in
> http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html
>
>
Regards,
-Hari Kodungallur
RE: Branching question
Posted by "Reedick, Andrew" <jr...@ATT.COM>.
svn merge supports ranges: svn merge -r 195:163 ...
If you have doubts about whether the unmerge worked, then grab a copy of
each version and diff them.
1. create a workspace
2. run the reverse merge in the workspace
3. svn export .../foo.exe HEAD.exe
4. svn export -r 162 .../foo.exe 162.exe
5. windows: fc /b HEAD.exe 162.exe
unix: cmp HEAD.exe 162.exe
6. If satisfied, then 'svn ci'
________________________________
From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
Sent: Thursday, November 15, 2007 11:40 AM
To: Reedick, Andrew; Subversion Mailing List
Subject: RE: Branching question
Interesting... What if I need to go back 4 revisions... The
current revision number is 195 and revision I need to get to is 162...
Do I need to so an "unmerge" for each revision, i.e. unmerge
195, unmerge 193, unmerge 191, and unmerge 187, which will get me to
162?
"Reedick, Andrew" <jr...@ATT.COM> wrote:
> From: Jeff Lanzarotta
[mailto:delux256-subversion@yahoo.com]
> Sent: Thursday, November 15, 2007 10:21 AM
> To: Subversion Mailing List
> Subject: Branching question
>
> I currently have a file, let's say foo.exe, checked
into an svn
> repository. My repository is set up with the typical
trunk,
> branches, and tags layout. The file foo.exe is checked
into
> the trunk. foo.exe has several revision against it, 1,
2, and
> 3 with 3 being the HEAD.
>
> Here is the question, can I move revisions 2 and 3
into a branch
> and make 1 the HEAD again? The powers at be do not
want the
> changes that are in revisions 2 and 3 until sometime
next year,
> so they want revert back to revision 1 as the HEAD. Is
this
> possible or is there a different way to do it...
1. Create next_year_branch from revision 3.
2. On the trunk, unmerge (do a reverse merge) revisions
2 and 3. Refer
to "Undoing Changes" in
http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html
---------------------------------------------------------------------
To unsubscribe, e-mail:
users-unsubscribe@subversion.tigris.org
For additional commands, e-mail:
users-help@subversion.tigris.org
*****
The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA621
RE: Branching question
Posted by Jeff Lanzarotta <de...@yahoo.com>.
Interesting... What if I need to go back 4 revisions... The current revision number is 195 and revision I need to get to is 162...
Do I need to so an "unmerge" for each revision, i.e. unmerge 195, unmerge 193, unmerge 191, and unmerge 187, which will get me to 162?
"Reedick, Andrew" <jr...@ATT.COM> wrote:
> From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
> Sent: Thursday, November 15, 2007 10:21 AM
> To: Subversion Mailing List
> Subject: Branching question
>
> I currently have a file, let's say foo.exe, checked into an svn
> repository. My repository is set up with the typical trunk,
> branches, and tags layout. The file foo.exe is checked into
> the trunk. foo.exe has several revision against it, 1, 2, and
> 3 with 3 being the HEAD.
>
> Here is the question, can I move revisions 2 and 3 into a branch
> and make 1 the HEAD again? The powers at be do not want the
> changes that are in revisions 2 and 3 until sometime next year,
> so they want revert back to revision 1 as the HEAD. Is this
> possible or is there a different way to do it...
1. Create next_year_branch from revision 3.
2. On the trunk, unmerge (do a reverse merge) revisions 2 and 3. Refer
to "Undoing Changes" in
http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: Branching question
Posted by "Reedick, Andrew" <jr...@ATT.COM>.
> From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
> Sent: Thursday, November 15, 2007 10:21 AM
> To: Subversion Mailing List
> Subject: Branching question
>
> I currently have a file, let's say foo.exe, checked into an svn
> repository. My repository is set up with the typical trunk,
> branches, and tags layout. The file foo.exe is checked into
> the trunk. foo.exe has several revision against it, 1, 2, and
> 3 with 3 being the HEAD.
>
> Here is the question, can I move revisions 2 and 3 into a branch
> and make 1 the HEAD again? The powers at be do not want the
> changes that are in revisions 2 and 3 until sometime next year,
> so they want revert back to revision 1 as the HEAD. Is this
> possible or is there a different way to do it...
1. Create next_year_branch from revision 3.
2. On the trunk, unmerge (do a reverse merge) revisions 2 and 3. Refer
to "Undoing Changes" in
http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org