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

Re: old Version to a new revision

From: Lieven Govaerts <lgo_at_mobsol.be>
Date: 2005-09-06 16:07:35 CEST

Unless I don't understand you correctly, your friend wants to get rid
of the changes in revision 12?

The correct way to do this is apply again all his changes in revision 12
to the repository, but backwards this time. This will make them 'disappear'.

You can do this with a merge action, taking the changes to get from
revision 12 back to revision 11, and apply them to your uptodate working
copy:
svn merge -r 12:11 http://path/to/repos /local/path/to/wc

You can the commit your working copy, which gives you revision 13.

Obviously this way he can't deny he ever made this changes, because they
still are in the history of the repository.

hope this helps,

Lieven.

Citeren Matthias Mosimann <matthias_mosimann@gmx.net>:

> Hi folks
>
>
> I've got this scenario: 2 Developers work with a subversion repository.
> Example: It's revision 10. I add 20 files. Then it's time for revision 11
> and my friend do some changes in some other files (araound 10 or so but not
> in mine). We have revision 12 now.
>
> But .. and now there is a problem: For Revision 13 he decide to go back to
> his revision 10 - files. Because he did some stupid things in Revision 12
> (when he did the changes). But he want also conserve my files from revision
> 11. What can he do?
>
> One solution is to check out the revesion 10 and copy all 10 files (that
> ones he changed in revsion 12) and make a new commit with the old files. So
> then he can conserve my 20 files I added in revision 11 and he restore his
> files from revsion 10. The we'll have revision 13. Is that a good plan?
>
> Now my question: Is there any simply command for this? (To push an old
> existing file that is allready under subversion controll to a totaly new
> revision?)
>
> I hope the context is clear and I excuse me for my poor english. If you have
> any further questions please ask them.
>
> Many thanks for your helps! The subversion team does a great job.
>
> regards
> Matthias
>
> --
> 5 GB Mailbox, 50 FreeSMS http://www.gmx.net/de/go/promail
> +++ GMX - die erste Adresse für Mail, Message, More +++
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 6 16:09:49 2005

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