Re: a question about "svn merge"

2011-06-22 Thread Stefan Sperling
On Wed, Jun 22, 2011 at 04:36:17AM -0400, boying...@emc.com wrote: > Hi, All, > > I use "svn merge ^trunk" to merge changes to my branch. > > I found one file that shows no conflict but actually the changes were > not added to this file at all. > > The subversion I use is 1.6.12. Is is a known

a question about "svn merge"

2011-06-22 Thread Boying.Lu
Hi, All, I use "svn merge ^trunk" to merge changes to my branch. I found one file that shows no conflict but actually the changes were not added to this file at all. The subversion I use is 1.6.12. Is is a known issue or a new bug? Thanks Boying