[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merging feature branch into trunk transmits unchanged files

From: Rick Yorgason <rick_at_ldagames.com>
Date: 2007-03-15 03:31:07 CET

Rick Yorgason wrote:
> The problem still exists with the correct revision numbers, though. The
> problem seems to be that when we merge the trunk into the branch,
> sometimes the files end up marked as modified instead of merged, and I'm
> not sure why. Here's an example:

Edit: I mean marked modified instead of replaced, not merged.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 15 03:31:08 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.