MightyCreak / diffuse

Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.
http://mightycreak.github.io/diffuse/
GNU General Public License v2.0
265 stars 45 forks source link

Add support for the SRC VCS #92

Closed bhepple closed 8 months ago

bhepple commented 3 years ago

Add support for the SRC VCS:

FAQ http://www.catb.org/~esr/src/FAQ.html resources http://www.catb.org/~esr/src/ source: https://gitlab.com/esr/src

bhepple commented 3 years ago

The ARCH package is at https://aur.archlinux.org/packages/src/ (I'm on fedora and there is no package available for 'src'. I might fix that)

FAQ: http://www.catb.org/~esr/src/FAQ.html resources http://www.catb.org/~esr/src/ man page http://www.catb.org/~esr/src/src.html source: https://gitlab.com/esr/src

Here's a simple scenario - a single file that we add to a new SRC repo (it's very like 'svn' in usage):

$ rm -rf ~/clean-dir
$ mkdir ~/clean-dir
$ cd ~/clean-dir
$ echo foo > myfile
$ src add myfile 
$ src commit -m "initial checkin" myfile 
$ echo foobar >> myfile 
$ src diff myfile 
--- myfile (r1)
+++ myfile (workfile)
@@ -1,2 +1,3 @@
 foo
+foobar
$ diffuse -r 1 myfile # shows diff of revision 1 and current file contents
bhepple commented 3 years ago

Hi - I just had surgery and am a bit dopey from painkillers. I'll try to get to this when I'm a bit better and my brain starts to obey logic again!! hopefully next week.

bhepple commented 2 years ago

So I've got my patches working against your latest. What should I do with them? I can't create a PR on this repo somehow. I could just send you a diff if you like. Anyway, it works fine for me. Oh look - I can attach a tarball ... support-src.tar.gz

BTW it wasn't my knee, it was abdominal but no worries it all went OK!!

MightyCreak commented 2 years ago

@bhepple well I don't know why I was sure it was your knee... brainfart I guess :wink:
But glad to see it all went well!

It's weird that you can't push more commits on top of your own branch. Could you maybe create another branch and create another MR? (The review features in GitHub are better than reviewing a tarball manually :smile: )

MightyCreak commented 1 year ago

I think you can't push more commits on this PR because you seem to have removed your fork on GitHub. You can always create a new PR with the commit + your new changes.