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

RE: Two strange problems

From: Bob Archer <bob.archer_at_amsi.com>
Date: Fri, 30 Oct 2009 14:44:39 -0400

>On Fri, Oct 30, 2009 at 7:33 PM, Bob Archer <Bob.Archer_at_amsi.com> wrote:
>>>I've faced 2 problems using SVN server 1.5.5.
>>>1) While merging branch with trunk SVN often misses some files that were changed. I mean some files have been changed significantly, but no changes according to SVN information. So during merge operation those files don't appear in changed files list.
>1. My target is branch. Source is trunk. SVN doesn't see that some files in trunk have changed although files are different in trunk and branch. Command sequence:
> - revert local changes in branch
> - update branch
> - update trunk
> - merge from trunk to branch

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.

>>>2) Sometimes SVN informs about conflict in file and aborts commit, but actually there is no conflict at all. Nobody has changed file before my commit.
>>2. Your target WC is up to date and has no pending changes?
>2. Yes.
>>3. A "conflict" during commit doesn't have to do with the merge. A conflict during a commit means someone changed the file in question in the repository since your last update (see item 2) and that you need to update your working copy and try again. A "conflict" during a merge would be different.
>3. Merge problem and file conflict problems are 2 separate problems. Sorry if I didn't make it clear.

 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?

 Also, please reply to all not just me. (I sent this back to the list) And do not top post.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-30 19:45:35 CET

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