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

RE: how do I loose last changes made ?

From: Tim Alsop <Tim.Alsop_at_CyberSafe.Ltd.UK>
Date: 2005-01-26 13:53:51 CET

Help !

I tried the 'svn merge' as explained in the book - here's what happened
:

I checked out latest (head) revision into a new directory (revision =
31681).
In this new directory I then did :

/home/cstb> svn merge -r 31681:31680
http://flik.csafe.local:8080/svn/cstb/trunk

svn: REPORT request failed on '/svn/cstb/!svn/bc/31681/trunk'

svn: The REPORT request returned invalid XML in the response: XML parse
error at line 26168: not well-formed (invalid token) (/svn/c
stb/!svn/bc/31681/trunk)

/home/cstb>

I was expecting the merge to undo the changes which occurred between
revision 31680 and 31681.

Any ideas ?

Thanks, Tim.

-----Original Message-----
From: Tim Alsop
Sent: 26 January 2005 11:19
To: 'Johan Appelgren'; users@subversion.tigris.org
Subject: RE: how do I loose last changes made ?

Yes, I had looked at this chapter, but wasn't 100% sure how to use the
changes I have already made to the x-1 revision. It sounds like I will
have to check out revision X, then use merge (as shown in svn book) to
revert back to x-1 and then make my local changes again before
committing. Is this correct ?

Thanks, Tim.

-----Original Message-----
From: Johan Appelgren [mailto:johan.appelgren@gmail.com]
Sent: 26 January 2005 11:04
To: users@subversion.tigris.org
Subject: Re: how do I loose last changes made ?

On Wed, 26 Jan 2005 10:47:45 -0000, Tim Alsop
<Tim.Alsop@cybersafe.ltd.uk> wrote:
> I have a quick 'how to' question, which I am sure somebody who uses
> svn more than me will be able to answer quickly ?
>
> Heres what I am doing :
>
> 1. make changes to wc files
> 2. commit changes using 'svn ci'
> 3. make changes to wc files
> 4. commit changes using 'svn ci'
> etc.
>
> The latest revision in repository is X (made by commit at step 4), but

> this commit involved many files changed in error. I therefore want to
> effectively ignore revision X and go back to revision X-1, make
> changes to this and commit as revision X+1. Heres what I tried :
>
<snip>

http://svnbook.red-bean.com/en/1.1/svn-book.html#svn-ch-4-sect-4.2

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 26 13:57:29 2005

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