[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 13:33:39 -0400

>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.
>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.
>Tried different clients. The same situations.
>Sorry but I cannot provide scripts/repository that can reproduce bugs because because I can't see which actions cause them.

Just a couple of questions.

1. What command are you running? I can't tell from your message if your target is trunk or branch?

2. Your target WC is up to date and has no pending changes?

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.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-30 18:34:41 CET

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