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.
From SVN's home page:
* Subversion is equally efficient on binary as on text files,
because it uses a binary diffing algorithm to transmit and store
successive revisions.
________________________________
From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
Sent: Thursday, November 15, 2007 12:52 PM
To: Reedick, Andrew; Ian Wood; Subversion Mailing List
Subject: RE: RE: Branching question
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" <jr9445@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 <Ian.Wood@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" <jr9445@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
Received on Thu Nov 15 19:40:36 2007