You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Ben Jackson <be...@incomumdesign.com> on 2005/05/06 01:14:17 UTC
Committing files from an older revision
I had to roll-back my working copy a few versions and am now having
difficulty committing my changes... SVN is asking me to update the
directory to HEAD, however I don't want to overwrite my changes. I tried
checking out the HEAD revision and copying individual files (not .svn
dirs), however it is still not letting me commit. Is there a better way
to do this?
--
Ben Jackson
Diretor de Desenvolvimento
INCOMUM Design & Conceito
ben@incomumdesign.com
http://www.incomumdesign.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Committing files from an older revision
Posted by Ben Collins-Sussman <su...@collab.net>.
On May 5, 2005, at 8:14 PM, Ben Jackson wrote:
> I had to roll-back my working copy a few versions and am now having
> difficulty committing my changes... SVN is asking me to update the
> directory to HEAD, however I don't want to overwrite my changes. I
> tried checking out the HEAD revision and copying individual files (not
> .svn dirs), however it is still not letting me commit. Is there a
> better way to do this?
>
Read chapter 4, "undoing changes".
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Committing files from an older revision
Posted by Ben Jackson <be...@incomumdesign.com>.
Thanks. Next time I'll do my homework ;) Sorry for the list clutter.
Steve Williams wrote:
> Ben Jackson wrote:
>
>> I had to roll-back my working copy a few versions and am now having
>> difficulty committing my changes... SVN is asking me to update the
>> directory to HEAD, however I don't want to overwrite my changes. I
>> tried checking out the HEAD revision and copying individual files
>> (not .svn dirs), however it is still not letting me commit. Is there
>> a better way to do this?
>
>
> Did you do it the way the manual says to?
>
> - check out HEAD revision.
> - do a reverse merge of the versions you want to remove.
> - commit.
>
> It's all in the book.
>
--
Ben Jackson
Diretor de Desenvolvimento
INCOMUM Design & Conceito
+55 (21) 9997-0593
ben@incomumdesign.com
http://www.incomumdesign.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Committing files from an older revision
Posted by Vincent Lefevre <vi...@vinc17.org>.
On 2005-05-06 11:25:09 +1000, Steve Williams wrote:
> - check out HEAD revision.
> - do a reverse merge of the versions you want to remove.
> - commit.
But is it cheap? That is, does it take a constant space in the
repository, whatever the changes have been made? I don't think
so, and this doesn't remove the corresponding history either
(not from the repository of course, but for the fixed version).
I'd thought that a "svn cp -rREV" would be a better solution,
if it works (one probably needs a "svn delete" first).
--
Vincent Lefèvre <vi...@vinc17.org> - Web: <http://www.vinc17.org/>
100% accessible validated (X)HTML - Blog: <http://www.vinc17.org/blog/>
Work: CR INRIA - computer arithmetic / SPACES project at LORIA
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Committing files from an older revision
Posted by Steve Williams <st...@kromestudios.com>.
Ben Jackson wrote:
> I had to roll-back my working copy a few versions and am now having
> difficulty committing my changes... SVN is asking me to update the
> directory to HEAD, however I don't want to overwrite my changes. I tried
> checking out the HEAD revision and copying individual files (not .svn
> dirs), however it is still not letting me commit. Is there a better way
> to do this?
Did you do it the way the manual says to?
- check out HEAD revision.
- do a reverse merge of the versions you want to remove.
- commit.
It's all in the book.
--
Sly
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org