Bug 12344

Description DJ Houghton 2002-03-27 09:45:31 EST

build 2002-03-21 on Win98.

Sorry, I don't have exact reproducable steps for this.

- I made changes to a java file and then popped up the context menu and 
chose "Synchonize with stream".
- the file was in conflict and it was a java file so it automatically brought 
up the structure compare
- the version in the repository had added a bunch of methods, so I did a bunch 
of "copy current change from right to left"
- but it put the methods in weird places

- one method declaration was put before the package declaration
- another method was put in the middle of another method, in the middle of a 
variable name
e.g.
old code:
  root.accept(visitor);
new code:
  ropublic void testMove() {
}ot.accept(visitor);