You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Igor Serebryany <ig...@monksofcool.org> on 2006/09/28 00:53:04 UTC

reverting single file in multi-file commit

Hi,

 	I am having the followingn problem, which I will describe in a 
scenario.  In my working copy, I changed files A, B and C and then 
commited the changes.  I then realized that file A should not have been 
changed.  I cannot figure out how to undo the change.

 	The folks at #svn pointed me to
http://svnbook.red-bean.com/nightly/en/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.undo
 	However, the example there assumes that the file I would like to 
revert was changed in its very own commit.  If I follow those 
instructions and apply the commit in reverse using svn merge, I would then 
have to restore changes to files B and C.

 	What makes the most sense to me is to issue
"svn update --revision PREV A"
 	in my working copy.  However, although my working copy is in the 
state that I want the repository to be after this command, "svn commit" 
now failes silently.

 	Am I going about this all wrong?  Or is this a bug, and svn commit 
out to do something, or at least give me a message telling me what I did 
wrong?

Thanks!

-Igor

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

svn 1.4 for ubuntu

Posted by Greg Irvine <gr...@thalesatm.com>.
Any idea when an Ubuntu release for svn 1.4 might be forthcoming?

Thanks.

Greg.

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

Re: reverting single file in multi-file commit

Posted by Andy Levy <an...@gmail.com>.
On 9/27/06, Igor Serebryany <ig...@monksofcool.org> wrote:
>
> Hi,
>
>         I am having the followingn problem, which I will describe in a
> scenario.  In my working copy, I changed files A, B and C and then
> commited the changes.  I then realized that file A should not have been
> changed.  I cannot figure out how to undo the change.
>
>         The folks at #svn pointed me to
> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.undo
>         However, the example there assumes that the file I would like to
> revert was changed in its very own commit.  If I follow those
> instructions and apply the commit in reverse using svn merge, I would then
> have to restore changes to files B and C.

No you wouldn't.  Instead of passing a directory, specify the one file
that you need to reverse merge..

>         What makes the most sense to me is to issue
> "svn update --revision PREV A"
>         in my working copy.  However, although my working copy is in the
> state that I want the repository to be after this command, "svn commit"
> now failes silently.

Why do you say it fails?  I would expect to see nothing happen,
because you haven't changed anything since performing the update.

>         Am I going about this all wrong?  Or is this a bug, and svn commit
> out to do something, or at least give me a message telling me what I did
> wrong?

See above.  The reverse merge *is* what you want, you just have to do
that merge on the single file, not on the whole directory.

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