Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

a single diff from wdiff can span multiple lines #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

jayenashar
Copy link

a single diff from wdiff can span multiple lines, therefore, i concatenate @InputStream into $inputstream[0].

@daveewart
Copy link
Contributor

Thanks jayenashar - not sure if this branch of colordiff will progress, but I can always port your change back to the main trunk code. Cheers :-)

@jayenashar
Copy link
Author

Hi Dave, where is trunk? I tried to find an 'official' repository to patch, and this one seemed like it, but I guess not.

@kimmel
Copy link
Owner

kimmel commented Apr 25, 2012

Do you have a sample diff you could post for testing? Did this happen with colordiff file1 file2 or cat sample.diff | colordiff?

Yes Dave, this branch of development is still ongoing.

@jayenashar
Copy link
Author

diff -u file1 file2 | wdiff -d - | grep . | colordiff

@daveewart
Copy link
Contributor

Jayen: In GitHub space, kimmel/colordiff is considered the trunk for development. Previous development of colordiff was carried out using CVS on SourceForge, although actually one I used that.

Kirk: glad to hear you are still planning to work on colordiff! Back in October, I presumed you'd lost interest after I had no reply from you after I pointed out my concerns regarding the use of various external Perl modules and App::FatPacker etc.. Would it be helpful if we could agree on a working framework for the environment into which colordiff will likely be deployed and, as a consequence, which external dependencies are appropriate?

@sparkplugmarcus
Copy link

I would love to see multiple line support! I did a local install of colordiff and added jayenashar's change but it did not work for me.

I am using colordiff to diff essays and documentation drafts that I collaborate with others on. It could offer a great way to review changes easily. Colordiff is used in conjunction with odt2txt and wdiff.

Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants