You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Tim Alsop <Ti...@CyberSafe.Ltd.UK> on 2005/01/26 10:47:45 UTC
how do I loose last changes made ?
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 :
5. in fresh local directory, I checked out revision X-1
6. I made changes in wc to fix my compile issues.
Now, I am stuck. How do I make the code in my new wc directory get used
as the latest revision, instead of X. I tried to commit the files, but I
get the following message :
/home/source> svn ci . -m"fix aix compile issues"
Sending common/config/Imake.tmpl
svn: Commit failed (details follow):
svn: Your file or directory 'common/config/Imake.tmpl' is probably
out-of-date
svn:
The version resource does not correspond to the resource within the
transaction. Either the requested version resource is out of da
te (needs to be updated), or the requested version resource is newer
than the transaction root (restart the commit).
/home/source>
What does this mean ?
Re: how do I loose last changes made ?
Posted by Johan Appelgren <jo...@gmail.com>.
On Wed, 26 Jan 2005 10:47:45 -0000, Tim Alsop
<Ti...@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
Re: how do I loose last changes made ?
Posted by Jacob Atzen <ja...@aub.dk>.
On Wed, Jan 26, 2005 at 10:47:45AM -0000, Tim Alsop 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 :
>
> 5. in fresh local directory, I checked out revision X-1
> 6. I made changes in wc to fix my compile issues.
>
> Now, I am stuck. How do I make the code in my new wc directory get used
> as the latest revision, instead of X.
Did you read the book?
<http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.2>
> I tried to commit the files, but I get the following message :
>
> /home/source> svn ci . -m"fix aix compile issues"
>
> Sending common/config/Imake.tmpl
>
> svn: Commit failed (details follow):
>
> svn: Your file or directory 'common/config/Imake.tmpl' is probably
> out-of-date
> svn:
>
> The version resource does not correspond to the resource within the
> transaction. Either the requested version resource is out of da
> te (needs to be updated), or the requested version resource is newer
> than the transaction root (restart the commit).
> What does this mean ?
That your working copy is older than what is in the repository. Your
working copy needs to be updated so it matches the head of the
repository.
--
Cheers,
- Jacob Atzen
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org