8

I duplicated some folder with project's config to a new project a few days ago and made there some modifications (project name, paths, etc). After few days a source config dir has changed and I am wondering how to diff that folders in 2 projects to apply that changes in new project.

If I select source file and then new file and select diff option in Netbeans - it works. But is it possible to make in on whole folder ?

hsz
  • 148,279
  • 62
  • 259
  • 315
  • Can you look at the new best answer, and possibly select it? I just tried it and it's perfect. – Yvan May 07 '15 at 07:49

4 Answers4

8

I was looking for folder compare in NetBeans too. I found http://kenai.com/projects/netbeans-dircomp/downloads. I'll try that in a little while...

OliCoder
  • 1,370
  • 10
  • 25
1

A very old question, but Netbeans does have a CVS feature now.

Go to Tools>Plugins and find CVS and install.

After that it is very easy to right click a directory, go to tools, then apply diff patch. That will patch all files in the diff file in that directory. Simple and smooth.

1

NetBeans does not have that feature.

You could probably hack together a shell script that would do this, based on find, etc. This search for 'diff a directory tree' looks like it has some good answer.

I would recommend that you put your source code under some sort of source code control system like CVS, SVN or Mercurial.

You could use those tools to generate a diff of the original project's config between the date you made the copy and 'now'... and then apply that diff onto the copy of the project...

Or, you could apply some of the strategies described in CVS manual for handling third party sources. I think the same concepts are available for svn and mercurial.

vkraemer
  • 9,864
  • 2
  • 30
  • 44
  • A work in progress, perhaps? Here are 2 open bugs: http://netbeans.org/bugzilla/show_bug.cgi?id=188543 http://netbeans.org/bugzilla/show_bug.cgi?id=189273 And a plugin: http://kenai.com/projects/netbeans-dircomp (At least for me on 7.2, that plugin correctly identifies changed files, BUT it fails/refuses to actually diff them.) – CrazyPyro Oct 25 '12 at 20:05
  • it looks like it can compare only files editable in IDE, so it works nice for sources and displays 'Not comparable' for other extensions. – shomeax May 08 '13 at 12:57
0

And You Can Also Use The
Total Commander
to Compare the folder and all type off your files
Its amazing in this situation

AmirModiri
  • 755
  • 1
  • 5
  • 13