10 added + 4 removed + 12 modified, total 26 files
testproject
diff -N delete_then_add
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ delete_then_add 11 Jul 2005 15:44:19 -0000 1.3
@@ -0,0 +1 @@
+rebirth
testproject
diff -u -u -r1.1 -r1.2
--- tasktest 11 Jul 2005 15:44:18 -0000 1.1
+++ tasktest 11 Jul 2005 15:44:19 -0000 1.2
@@ -1,4 +1,7 @@
removed items should not be highlighted
-TODO: remove this item
-also remove this FIXME
TODO check that unchanged items are ignored
+TODO needs doing
+please FIXME some time soon
+looks odd when the end of the line says TODO
+on the same line, TODO and FIXME appear
+My MASTODON should not be highlighted
testproject/branchedfiles
diff -N added
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ added 11 Jul 2005 15:44:20 -0000 1.1.2.1
@@ -0,0 +1 @@
+this file has been added on the branch, never existing on the trunk
testproject/branchedfiles
diff -u -u -r1.1 -r1.1.2.1
--- modified 11 Jul 2005 15:44:16 -0000 1.1
+++ modified 11 Jul 2005 15:44:20 -0000 1.1.2.1
@@ -1 +1 @@
-file to be edited on branch
+file edited on branch
testproject/branchedfiles
diff -u -u -r1.1.2.1 -r1.1.2.1.2.1
--- modified2 11 Jul 2005 15:44:17 -0000 1.1.2.1
+++ modified2 11 Jul 2005 15:44:20 -0000 1.1.2.1.2.1
@@ -1 +1 @@
-file to be modified on another branch, never existing in the trunk
+file modified on another branch, never existing in the trunk
testproject/branchedfiles
diff -N remove
--- remove 11 Jul 2005 15:44:18 -0000 1.1.2.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-file to be removed from the branch
testproject/emptyfiles
diff -u -u -r1.1 -r1.2
--- modify 11 Jul 2005 15:44:18 -0000 1.1
+++ modify 11 Jul 2005 15:44:20 -0000 1.2
@@ -0,0 +1 @@
+new line
testproject/funnynames
diff -N entity&file
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ entity&file 11 Jul 2005 15:44:20 -0000 1.1
@@ -0,0 +1 @@
+name contains hmtl entity
testproject/funnynames
diff -N html<b>file
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ html<b>file 11 Jul 2005 15:44:20 -0000 1.1
@@ -0,0 +1 @@
+file name contains html element
testproject/funnynames
diff -N space file
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ space file 11 Jul 2005 15:44:20 -0000 1.1
@@ -0,0 +1 @@
+name contains space character
testproject/simplefiles
diff -N add
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ add 11 Jul 2005 15:44:20 -0000 1.1
@@ -0,0 +1,12 @@
+pipe
+IO.pipe -> anArray
+
+ Creates a pair of pipe endpoints (connected to each other) and returns
+ them as a two-element array of IO objects: [ readFile, writeFile ]. Not
+ available on all platforms.
+
+ In the example below, the two processes close the ends of the pipe that
+ they are not using. This is not just a cosmetic nicety. The read end of a
+ pipe will not generate an end of file condition if there are any writers
+ with the pipe still open. In the case of the parent process, the rd.read
+ will never return if it does not first issue a wr.close.
testproject/simplefiles
diff -u -u -r1.1 -r1.2
--- addeol 11 Jul 2005 15:44:18 -0000 1.1
+++ addeol 11 Jul 2005 15:44:20 -0000 1.2
@@ -1,2 +1,2 @@
this file is missing it's end-of-line character on the last line
-it should be here->
\ No newline at end of file
+it should be here->
testproject/simplefiles
diff -u -u -r1.1 -r1.2
--- deleteall 11 Jul 2005 15:44:18 -0000 1.1
+++ deleteall 11 Jul 2005 15:44:20 -0000 1.2
@@ -1,6 +0,0 @@
-each_byte
-ios.each_byte {| byte | block } -> nil
-
- Calls the given block once for each byte (0..255) in ios, passing the
- byte as an argument. The stream must be opened for reading or an IOerror
- will be raised.
testproject/simplefiles
diff -u -u -r1.1 -r1.2
--- fiddlyedits 11 Jul 2005 15:44:18 -0000 1.1
+++ fiddlyedits 11 Jul 2005 15:44:20 -0000 1.2
@@ -2,115 +2,115 @@
1. Change the whole line
-012345678901234567890123456789012345678901234567890123456789
+asbcgefgfijklmnopqrstuvwxyzasbcgefgfijklmnopqrstuvwxyzabcdef
2. Change most of the line
-012345678901234567890123456789012345678901234567890123456789
+0sbcgefgfijklmnopqrstuvwxyzasbcgefgfijklmnopqrstuvwxyzabcde9
3. Change at start of line
-012345678901234567890123456789012345678901234567890123456789
+a12345678901234567890123456789012345678901234567890123456789
4. Change at end of line
-012345678901234567890123456789012345678901234567890123456789
+01234567890123456789012345678901234567890123456789012345678b
5. Change at both ends of line
-012345678901234567890123456789012345678901234567890123456789
+a1234567890123456789012345678901234567890123456789012345678b
6. Change all but initial tab
- 012345678901234567890123456789012345678901234567890123456789
+ asbcgefgfijklmnopqrstuvwxyzasbcgefgfijklmnopqrstuvwxyzabcdef
7. Change one char
-012345678901234567890123456789012345678901234567890123456789
+0123456789012345678901234567a9012345678901234567890123456789
8. Change two chars
-012345678901234567890123456789012345678901234567890123456789
+01234567890123456789012345678ab12345678901234567890123456789
9. Change four chars
-012345678901234567890123456789012345678901234567890123456789
+01234567890123456789012345abcd012345678901234567890123456789
10. Change eight chars
-012345678901234567890123456789012345678901234567890123456789
+01234567890123456789012345678901abcdefgh01234567890123456789
11. Change sixteen chars
-012345678901234567890123456789012345678901234567890123456789
+0123456789012345678abcdefghijklmnop5678901234567890123456789
12. Change thirty two chars (>33% change not highlighted)
-012345678901234567890123456789012345678901234567890123456789
+01234567890123456789abcdefghijklmnopqrstuvwxyzabcdef23456789
13. Add a single character
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
14. Delete a single character
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
13. Indent more
- tab
+ tab
14. Indent less
- tab
+ tab
15. Add trailing space
-aaaaaaaa
+aaaaaaaa
16. Remove trailing space
-aaaaaaaa
+aaaaaaaa
17. Convert dos end-of-line to unix
-aaaaaaaa^M
+aaaaaaaa
18. Convert unix end-on-line to dos
-aaaaaaaa
+aaaaaaaa^M
19. Change several adjacent lines (not handled)
-aaaaaaaaaaaaaaaaaaaa
-bbbbbbbbbbbbbbbbbbbb
+aaaa1aaaaa
+bbbb2bbbbb
20. Several adjacent lines with similar first/last
-aaaaaaaaaaaaaaaaaaaa
-bbbbbbbbbbbbbbbbbbbb
-aaaaaaaaaaaaaaaaaaaa
+aaaa1aaaaaaaaaaaaaaa
+bbbb2bbbbbbbbbbbbbbb
+aaaa1aaaaaaaaaaaaaaa
THE END
testproject/simplefiles
diff -u -u -r1.1 -r1.2
--- longlines 11 Jul 2005 15:44:18 -0000 1.1
+++ longlines 11 Jul 2005 15:44:20 -0000 1.2
@@ -1,28 +1,28 @@
1. Long line in context
012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678>[...]
-edit me!
+edited me!
2. Long line altered (with change-highlight)
-012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678>[...]
+a12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678>[...]
-012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678>[...]
+012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345a78>[...]
-012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678>[...]
+012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678>[...]
3. Multiple long lines altered
-012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678>[...]
-012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678>[...]
+a12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678>[...]
+a12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678>[...]
4. Long lines added
+012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678>[...]
+012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678>[...]
5. Long lines removed
-012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678>[...]
-012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678>[...]
[Note: Some over-long lines of diff output only partialy shown]
testproject/simplefiles
diff -u -u -r1.1 -r1.2
--- modify 11 Jul 2005 15:44:18 -0000 1.1
+++ modify 11 Jul 2005 15:44:20 -0000 1.2
@@ -1,19 +1,20 @@
popen
-IO.popen( aCmdString, aModeString="r" ) -> anIO
IO.popen( aCmdString, aModeString="r" ) {| anIO | block } -> nil
Runs the specified command string as a subprocess; the subprocess's
standard input and output will be connected to the returned IO object. If
- aCmdString starts with a ``-'', then a new instance of Ruby is started as
- the subprocess. The default mode for the new file object is r'', but
+ aCmdString starts with a "-", then a new instance of Ruby is started as
+ the subprocess. The default mode for the new file object is "r", but
aModeString may be set to any of the modes in Table 22.5 on page 326.
+ Always prefer the form given above to the no-block style
+
If a block is given, Ruby will run the command as a child connected to
Ruby with a pipe. Ruby's end of the pipe will be passed as a parameter to
the block.
- If a block is given with a aCmdString of ``-'', the block will be run in
+ If a block is given with a aCmdString of "-", the block will be run in
two separate processes: once in the parent, and once in a child. The parent
process will be passed the pipe object as a parameter to the block, the
- child version of the block will be passed nil, and the child's standard in
- and standard out will be connected to the parent through the pipe. Not
+ child version of the block will be passed nil, and the child's standard
+ in and standard out will be connected to the parent through the pipe. Not
available on all platforms.
testproject/simplefiles
diff -N remove
--- remove 11 Jul 2005 15:44:18 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-binmode
-ios.binmode -> ios
-
- Puts ios into binary mode. This is useful only in MS-DOS/Windows
- environments. Once a stream is in binary mode, it cannot be reset to
- nonbinary mode.
testproject/simplefiles
diff -u -u -r1.1 -r1.2
--- removeeol 11 Jul 2005 15:44:18 -0000 1.1
+++ removeeol 11 Jul 2005 15:44:20 -0000 1.2
@@ -1,2 +1,2 @@
this file will have the end-of-line character removed from the last line
-from just here->
+from just here->
\ No newline at end of file
anotherproject
diff -N README
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ README 11 Jul 2005 15:44:21 -0000 1.1
@@ -0,0 +1 @@
+test commiting to multiple repositories at once
CVSspam 0.2.12