On Thu, 15 Mar 2012 02:06:08 +0000, Daniel Shahaf wrote: > Andreas Krey wrote on Wed, Mar 14, 2012 at 15:33:35 +0100: ... > > But the real strange thing: I did only do a merge; not actually > > edit any properties myself. > > > > So? Propchanges are merged too.
Yes, but they weren't modified (but moved with the tree) in the whole branch lifetime on either trunk or the branch. And they both look good (only printable chars and \n/0x0a in the properties, with --strict). Unfortunately the problem has been resolved by throwing away the properties. Also it happened not on the conflicted forward merge into the branch, but on the --reintegrate backmerge, and I've had thrown away the other sandboxes that refuse to commit in frustration. (And this was one of those frustrating merges where you get just a delete/edit conflict on src/com when the merge algorithm didn't realize that src/com was actually moved to src/java/com and thus fails to apply the changes in src/com there.) > > Using a 1.7 client on an 1.5.few server. > > I think the error message only exists in 1.6+ servers. You're right, someone had mercy, and it's 1.6.6. Andreas -- "Totally trivial. Famous last words." From: Linus Torvalds <torvalds@*.org> Date: Fri, 22 Jan 2010 07:29:21 -0800
