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

Re: Create a copy in WC before merging

From: SVram <malsam.v2_at_gmail.com>
Date: Mon, 14 Dec 2009 06:51:27 -0800 (PST)

welo-2 wrote:
>
>
>>In my case i want to do the comparison after i update to revision 11,the
comparison is between revision >11 and what i have changed on revision 10.
>
>>So how can create a copy of this changeg file
>>before i issue update to revision 11? i need this copy to return to it
later if i have problems with merging.
>
>

svn diff will do that. hav like this .

1.a.txt in r10,its content is "hi" in the first line and now you are adding
"hi" in 11th line and saving that. At the same time some one modifies a.txt
by adding "hi" in 21st line and committed that r11. (so now if any one
checks out a.txt the contents will be "hi" in 1st line and 21st line) Your
change will not be reflected since you dint commit.

2. Now you are updating that to r11 so final a.txt changes to "hi" in 1st
line, 11th line and 21st line.

3. Now if you take * svn diff a.txt * it will show the diff as "hi" added in
11th line which is only your change. And you can redirect that to a patch.
like

svn diff a.txt > a.patch.

Note: If you had modified more than one file and you want to know your
modifications in all the files you can just put
 
*svn diff * inside that working copy.

Thanks & Regards,
S V Ram

-- 
View this message in context: http://old.nabble.com/Create-a-copy-in-WC-before-merging-tp26773984p26778955.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2430298
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-14 15:51:37 CET

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