Re: Two strange problems

On Fri, Oct 30, 2009 at 8:44 PM, Bob Archer <Bob.Archer_at_amsi.com> wrote:

> Can you verify that the differences between the branch and the trunk file
> is due to changes in the trunk since you created the branch and not changes
> in branch? Just because the files are "different" doesn't mean a merge will
> do anything. A merge takes any changes that have been make in the source URL
> since the branch was created and merges them into your target.
>
Yes, I have verified.

>
> OK, so your WC is up to date and you issue:
>
>
>
> svn up
>
> svn commit
>
>
>
> ... and you get a conflict error? Can you duplicate the error here it
> might be easier to help?
>
Ok, I'll post an error message as soon as it happens again.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2413204

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-31 11:32:58 CET