Is there any tool in windows to compare two folder and to generate difference report by using "Tortoise SVN". can any one help me to do this.
Thank in advance..
TortoiseSVN is the wrong tool for the job if you have two arbitrary folders and need to compare them. It's like using a wrench to pound nails - it works by using a particular feature, but it's not going to get you the results you want.
I use WinMerge to compare both files and folders. Whether it will produce the report output you're looking for I can't say, as you haven't defined what this "report" should show (or now).
While alroc is totally right (but his selection of diff-tool is a question, next question), TortoiseSVN (surprise !!!) can be used as tool for diffing folder (it's perversion, yes, but it's possible)
Create new repo
Import into repo Folder I
Import into repo Folder II
svn diff ... > report two folders in repo and get difference-report
Delete repo
Related
When using Git and the Git GUI, I'm used to highlighting one or more lines, right-click and use the selection as what I want to check-in. This way, I can for example create two check-ins from the same file: say fixed typos (not interesting) and new functionality (interesting for someone that checks the version history).
In Visual Studio, I can only check in the entire file, but not specific lines. In order to do this, I could:
copy the server-version and my local version to Notepad++ as two files,
compare the two files,
copy the selected changes to my reverted local version that I want
to check in,
then check in the current changes,
and finally copy all the remaining changes to my local version so that all
changes are back in my local version. (rinse and repeat for all separate changesets)
This is... not ideal.
Is there a way (perhaps via a client-side plugin) that I can select a part of a file to check-in, but leave the remainder un-checked in?
You basically want to do a version control in other words. There are lott of them like git,SVN they are designed to do what you want.
I am writing a documentation for a project that involves multiple developers. We use Subversion (SVN) to work on our code base.
I wrote the first draft of the documentation document using HelpNDoc, which I like for the nice tree-view and easy of use; the problem is that there is a single file, so I don't know how to use SVN to allow other developers to contribute to the documentation and update it.
Do you know if it's possible? If not, can you advice a nice software, easy to use, with a tree-view of the documentation that can be used with SVN or makes it possible for multiple users to update it? We use Windows.
HelpNDoc projects are binary files based on the SQLite open source database engine. The advantage is that the whole documentation stored in a single file so it can easily be copied, moved, shared, backed-up...
However one drawback is that it has to be checked-in as binary content in any version control system including Subversion: diff and merge are not possible on those files.
One possible solution would be to use external documents in HelpNDoc's library: each user works on her own document (which can be a Word document, and HTML web-page...) and a master HelpNDoc project is created to include those documents at generation time. See "Include a file at generation time" in the following step by step guide: How to add an item to the library
Amount of files doesn't matter, real format (text/* or binary) - does. If SVN|any VCS can merge two HelpNDoc files with diverged history (just try it by hand), you'll be happy
I once used Helpinator for software documentation, it's pretty close to HelpnDoc but it's storage format is more suitable for version control.
I need a file compare and merge utility like Synchronize It! only for Mac. THE MOST IMPORTANT feature to me that I cannot seem to find is the ability to save off files that are different and keep the folder structure. As an example, I have a production version of a web app and a self-hosted version of the same app. When I make changes in the production version, I want to provide patches for the self-hosted version - but only the files that have changed. There could be 1/2 dozen files in 5 different directories. So, I need to be able to easily save these files somewhere instead of just merging them. And I don't want to have to print out a diff report, copy the files manually, create the file structure, etc. etc. Thanks!
patch is the inverse of diff. rsync is pretty awesome at keeping files synchronized.
I'm using Visual SVN with Visual Studio 2010 and want to work on a feature branch of my solution. I've read the documentation here and the book regarding branching. I'm new to Visual SVN and seem to be missing the idea of where I should keep my copies of the files I am using to actually develop and compile the different version of my project. I understand that to SVN, the repository basically holds "virtual" copies of the files. Will I need separate local copies so that one folder will contain only those files from the trunk copy and some separate folder will contain the full solution of the branch?
As I understand it, Visual Svn will let me make my local copies wherever I want, but I'm trying to figure out a logical way to do this. If I have two separate folders with these near-identical versions of my app, won't I have two indistinguishable entries in Visual Studio's start menu? They would list different paths if I mouse over it I suppose. Am I missing the point, or do I just feel awkward about the way to do this?
Yes, I think it is only subjective. It was the same for me the first times with SVN, but...
Checkout in different folders for trunk and branches (naming each folder in a meaningful way)
then create two different desktop shortcut to your different solutions in your different folders and go back to code...
I've got several projects:
P:\Projects\Common
P:\Projects\App1
I originally added each of the folders (and their sub folders) to CVS (using Tortoise).
Now I want to be able to just right clock Projects\ and "Commit" everytime I save anything in those folders.
However, it seems that \Project is separate from \Common which is also seperate from \App1
So if a file shows it' needs a checkin in \Common and I do a Commit on P:\Projects, it shows "no changes"
Is there any way to force all the subtending folders to commit?
Or is there a way to merge all of them? (Or even start all over with a new repository so that all of P:\projects are in the same "project" so that I can just do one checkin for all of them?
You could either make a new CVS module that is a parent to all of your other directories or look into alias modules.
I have used alias modules to bring together multiple components into a single checkout (and therefore check-in) but you do need read/write access to the CVSROOT module to set it up.
This walkthrough of someone setting up something similar may be useful to you.