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

I should merge or patch?

From: Edwin <EdwinTai_at_gmail.com>
Date: Thu, 27 Nov 2008 07:08:00 -0800 (PST)

I had a file modified many times in the same directory,ex,it's
revision 1,2,3,4,5,6
revision 2 is correct.and part of 3 and part of 5.
I want to revert to revision 2 and merge revison 3 and 5.
I use show log -> revert to this revision 2 and select revision 3,5
then choose Merge revison to my working copy.nothing happened...
I wonder to know,what is the right way to reach my correct result?
I think that merge is from branch or tag or other different
directory.not for the same file.
so should I save revison 2,3,5 each other and diff patch and apply to
revsion 2?
thanks help..

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-11-27 16:08:37 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.