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

Re: a problem with a frequent (?) use case

From: John Szakmeister <john_at_szakmeister.net>
Date: 2005-02-15 10:23:59 CET

Zouari Fourat wrote:
> Hello
> Am new to svn, am using it for 2 months ago and now i've faced a problem :
> My project revisions are :
> Initial import -> R2 -> R3 -> R4 ..... R35 -> R36
> Rx means Revision x
> and now when commiting to the last revision wich is 36 and exported
> that revision on the productif server wich was holding R35, that new
> revision had some problems so i returned to the R35 (last stable
> revision)
> so when i want to continue developing my project, i do :
> svn co ... -r35
> so am working on the r35 and not on the last one (36) and when trying
> to commit it shows an error saying it cannot commit changes.
> someone could help me please ?

You need to back out the changes that r36 introduced. Take a look at:

In short, you need to run 'svn merge -r36:35 .' at the top of your
working copy and commit. Then you'll be ready to try again with a
different set of changes. The SVN book is very helpful in that it
describes a lot of patterns like this. You should really give it a
read. It's at http://svnbook.org.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 15 10:26:39 2005

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.