Author: kkolinko
Date: Wed Jun 6 12:52:20 2012
New Revision: 1346864
URL: http://svn.apache.org/viewvc?rev=1346864view=rev
Log:
Remove svn:merge-info property on EchoMessage.java, that was added in r1346684
Note: Merges should be started from project root - tc7.0.x/trunk, and project
root has
Konstantin,
On 6/6/12 8:52 AM, kkoli...@apache.org wrote:
Author: kkolinko
Date: Wed Jun 6 12:52:20 2012
New Revision: 1346864
URL: http://svn.apache.org/viewvc?rev=1346864view=rev
Log:
Remove svn:merge-info property on EchoMessage.java, that was added in r1346684
Note: Merges should
2012/6/6 Christopher Schultz ch...@christopherschultz.net:
Konstantin,
On 6/6/12 8:52 AM, kkoli...@apache.org wrote:
Author: kkolinko
Date: Wed Jun 6 12:52:20 2012
New Revision: 1346864
URL: http://svn.apache.org/viewvc?rev=1346864view=rev
Log:
Remove svn:merge-info property on
Konstantin,
On 6/6/12 2:45 PM, Konstantin Kolinko wrote:
# Merging:
1. Run update before merge.
Of course :)
2. Invoke merge from the root of the project, so that svn:merge-info
on the project root directory is updated.
I think this is what I failed to do with the EchoServlet: since
