Author: stsp
Date: Sun Nov 27 13:35:14 2011
New Revision: 1206718
URL: http://svn.apache.org/viewvc?rev=1206718view=rev
Log:
Fix issue #3814 patch doesn't append newline to properties.
This fix depends on the change made to 'svn diff' output in r1206576.
* subversion/libsvn_diff/parse-diff.c
Author: stsp
Date: Sun Nov 27 13:43:09 2011
New Revision: 1206719
URL: http://svn.apache.org/viewvc?rev=1206719view=rev
Log:
Follow-up to r1206576: Blind attempt to fix JavaHL test failure.
[in subversion/bindings/javahl/tests]
* org/tigris/subversion/javahl/BasicTests.java,
Author: stsp
Date: Sun Nov 27 14:20:01 2011
New Revision: 1206722
URL: http://svn.apache.org/viewvc?rev=1206722view=rev
Log:
Create branch for issue #3814 fix backport to 1.7.x.
Added:
subversion/branches/1.7.x-issue3814/ (props changed)
- copied from r1206721,
Author: stsp
Date: Sun Nov 27 14:41:56 2011
New Revision: 1206724
URL: http://svn.apache.org/viewvc?rev=1206724view=rev
Log:
Fix issue #3991, 'svn patch' deletes random lines with patch files missing
trailing newline.
Contrary to UNIX patch behaviour, I decided not to have 'svn patch' error
out
Author: stsp
Date: Sun Nov 27 14:47:24 2011
New Revision: 1206725
URL: http://svn.apache.org/viewvc?rev=1206725view=rev
Log:
On the 1.7.x-issue3814 backport branch, merge the following revisions
from trunk, resolving conflicts:
r1166267: Merged to prevent conflicts in diff_tests.py.
r1206576:
Author: stsp
Date: Sun Nov 27 14:51:26 2011
New Revision: 1206726
URL: http://svn.apache.org/viewvc?rev=1206726view=rev
Log:
* STATUS: Nominate issue #3814 fix.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: stsp
Date: Sun Nov 27 15:00:07 2011
New Revision: 1206728
URL: http://svn.apache.org/viewvc?rev=1206728view=rev
Log:
Create a 1.7.x backport branch for issue #3991.
Added:
subversion/branches/1.7.x-issue3991/ (props changed)
- copied from r1206727, subversion/branches/1.7.x/
Author: stsp
Date: Sun Nov 27 15:21:58 2011
New Revision: 1206730
URL: http://svn.apache.org/viewvc?rev=1206730view=rev
Log:
On the 1.7.x-issue3991 branch, merge the issue #3991 fix from trunk,
resolving conflicts.
This fix depends on a piece of the issue #3814 fix. This bit has been
merged in
Author: stsp
Date: Sun Nov 27 15:27:36 2011
New Revision: 1206732
URL: http://svn.apache.org/viewvc?rev=1206732view=rev
Log:
* STATUS: Nominate #3991 fix.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: stsp
Date: Sun Nov 27 15:32:52 2011
New Revision: 1206737
URL: http://svn.apache.org/viewvc?rev=1206737view=rev
Log:
* STATUS: typo (double negative)
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: stsp
Date: Sun Nov 27 15:39:43 2011
New Revision: 1206741
URL: http://svn.apache.org/viewvc?rev=1206741view=rev
Log:
Follow-up to r1206724: Fix an issue #3991 diff parsing test to make it pass.
Found by: danielsh
* subversion/tests/libsvn_diff/parse-diff-test.c
(check_content): Allow
Author: stsp
Date: Sun Nov 27 15:47:05 2011
New Revision: 1206745
URL: http://svn.apache.org/viewvc?rev=1206745view=rev
Log:
Merge r1150344, r1158929 and r1206741 from trunk into 1.7.x-issue3991.
r1150344 - merged to avoid conflicts
r1158929 - adds a new diff parsing regression test
Author: stsp
Date: Sun Nov 27 15:49:49 2011
New Revision: 1206746
URL: http://svn.apache.org/viewvc?rev=1206746view=rev
Log:
* STATUS: Note additional revs merged into the 1.7.x-issue3991 branch.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: stsp
Date: Sun Nov 27 15:51:08 2011
New Revision: 1206748
URL: http://svn.apache.org/viewvc?rev=1206748view=rev
Log:
* subversion/tests/libsvn_diff/parse-diff-test.c
(test_parse_unidiff_lacking_trailing_eol): Remove obsolete comment.
Found by: danielsh
Modified:
Author: stsp
Revision: 1206724
Modified property: svn:log
Modified: svn:log at Sun Nov 27 16:03:29 2011
--
--- svn:log (original)
+++ svn:log Sun Nov 27 16:03:29 2011
@@ -16,7 +16,7 @@ by appending an EOL. There are two
15 matches
Mail list logo