你可以使用

svn help up

来查看。

For each updated item a line will start with a character reporting the
action taken. These characters have the following meaning:

A Added 
D Deleted 
U Updated 
C Conflict 
G Merged

A character in the first column signifies an update to the actual file, while updates to the file's props are shown in the second column.

由上面的可以看出，G是成功合并了。说明你本地的这个文件有修改，服务器上的版本也有修改，但是在up时，svn自动帮你merge了。