Re: svn output wrong character when set no-unicode in windows7

2012-10-18 Thread Thorsten Schöning
Guten Tag Justin Wu, am Donnerstag, 18. Oktober 2012 um 23:47 schrieben Sie: > Hi, I tried code page 936, still get the same result, please see attached > screen shot. The encoding is not the only thing to consider, the font needs to be able to display the characters, too. The default console fo

Re: svn output wrong character when set no-unicode in windows7

2012-10-18 Thread Justin Wu
Hi, I tried code page 936, still get the same result, please see attached screen shot. On Thu, Oct 18, 2012 at 5:31 AM, Rob Pointer wrote: > Justin > Have you tried setting the windows command line to code page 936 (this is > listed as the correct code page for simplified Chinese in Windows (se

Re: unexpected tree conflict on merge for same source file

2012-10-18 Thread Stefan Sperling
On Thu, Oct 18, 2012 at 02:10:25PM +0200, Sven Uhlig wrote: > Am 17.10.2012 19:12, schrieb Stefan Sperling: > > On Wed, Oct 17, 2012 at 05:30:14PM +0200, Sven Uhlig wrote: > >> There could be > >> changes that are commited to prj1 that are requried in prj2 because of > >> e.g. some shared code. > >

Re: unexpected tree conflict on merge for same source file

2012-10-18 Thread Sven Uhlig
Am 17.10.2012 19:12, schrieb Stefan Sperling: > On Wed, Oct 17, 2012 at 05:30:14PM +0200, Sven Uhlig wrote: >> There could be >> changes that are commited to prj1 that are requried in prj2 because of >> e.g. some shared code. >> >> I would do this with the following command: >> svn merge -r A:B

Re: svn output wrong character when set no-unicode in windows7

2012-10-18 Thread Rob Pointer
Justin Have you tried setting the windows command line to code page 936 (this is listed as the correct code page for simplified Chinese in Windows (see http://msdn.microsoft.com/en-us/library/windows/desktop/dd317756(v=vs.85).aspx ) You should be able to set the code page using the command *cp 936