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=1346864&view=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 > to be included in subsequent commit. That way svn:merge-info will be present > only on the project root directory.
Sorry about that. I use Eclipse: what is the best way to do and commit a proper merge? Should I be committing not only the changed files but also the project-root as a directory? If I do that, I think Eclipse (or even svn) would force me to commit every change all at once -- i.e. I can't work on multiple patches at the same time. I'm sure that's not true, so I'm certainly open to some education. Thanks, -chris
signature.asc
Description: OpenPGP digital signature
