[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Rolling back some components of a tag

From: Erik Andersson <kirean_at_gmail.com>
Date: Thu, 19 Aug 2010 14:39:55 +0200

On Thu, Aug 19, 2010 at 2:33 PM, David Aldrich <David.Aldrich_at_eu.nec.com>wrote:

> Hi Erik
>
>
>
> Thanks for your reply.
>
>
>
> svn merge http://host/trunk -c -1859 .
>
svn merge http://host/trunk -c -1859 pegtest.txt

That will revert r1859 from the trunk for the specified file (it will try to
reverse merge the 1859 changeset)

>
>
> The trouble is that this will bring in all changes at r1859, not just those
> made to pegtest.txt. I realise that in my example there are no other changes
> but I am looking for the general case.
>
>
>
> Is there any other way of changing the revision of one file in a branch,
> where that revision has not existed in the branch before?
>
>
>
> David
>
>
>
>
>
> *From:* Erik Andersson [mailto:kirean_at_gmail.com]
> *Sent:* 19 August 2010 12:51
> *To:* David Aldrich
> *Cc:* users_at_subversion.apache.org
> *Subject:* Re: Rolling back some components of a tag
>
>
>
> Hi
>
>
>
> I'm not sure what you are trying to achieve.. but..
>
> On Thu, Aug 19, 2010 at 1:25 PM, David Aldrich <David.Aldrich_at_eu.nec.com>
> wrote:
>
> Hi
>
> It has been suggested that I use peg revisions to solve this problem.
> However, I don't understand peg revision syntax.
>
> As a test, I created a new text file in the trunk called pegtest.txt and
> then made changes to it:
>
> r1855 commit pegtest.txt ver.1
> r1856 commit pegtest.txt ver.2
> r1857 commit pegtest.txt ver.3
> r1858 create tag of trunk
> r1859 commit pegtest.txt ver.4
> ...
> r1861 create branch of tag
> r1862 commit pegtest.txt ver.5
>
>
> Now if I look at my branch, pegtest.txt is ver.3 i.e. r1857 as expected.
>
> If, in my branch, I do:
>
>
> svn update -r1856 pegtest.txt
>
> I'm still on old subversion not having caret-functionality so I would do
> (in the branch):
>
> svn merge http://host/trunk -c -1859 .
>
> svn ci -m"reverted [1859] from branch"
>
>
>
>
> pegtest.txt gets deleted. I guess this is because the branch did not exist
> in r1856.
>
> How can I use a PEG revision to bring pegtest.txt r1856 from the trunk into
> the branch please?
>
> BR
>
> David
>
>
>
>
>
> Click here<https://www.mailcontrol.com/sr/7CIzws17dgrTndxI!oX7UpXM+ujx+BRVz7p3J4sSUPewj124b1KFs7S185H!Tx42Lh5vRJX6NScWVaQUGz3XVw==>to report this email as spam.
>
Received on 2010-08-19 14:40:33 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.