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

RE: Unified diff function removed from merge

From: Jeff Simon <jas_at_rephunter.net>
Date: Mon, 8 Sep 2008 15:18:40 -0500

I have performed the process. The only difference being on the second step,
there is no "compare" option. The choice is apparently "show differences as
a unified diff."

Which seems to work fine.

Thanks for the quick response!


-----Original Message-----
From: Stefan Küng [mailto:tortoisesvn_at_gmail.com]
Sent: Thursday, September 04, 2008 1:48 PM
To: users_at_tortoisesvn.tigris.org
Subject: Re: Unified diff function removed from merge

Jeff Simon wrote:
> Prior to 1.5, I would frequently use the unified diff function of the
> merge to examine the differences between branches. I especially found
> this useful as a quality control check before merging.
> Since 1.5, this function seems to have been removed. The workaround is
> to compare each file one at a time.
> Is there any simpler way to get the unified diff of two branches?

You can get a diff of two branches with the repobrowser:
* right-click on one branch, choose "mark for comparison".
* browse to the second branch, right-click, choose "compare"


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-09-08 22:18:52 CEST

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