Problems merging a branch back to the trunk

Hello,

I've run into the following problems when merging back a branch to the
trunk after issuing

svn merge -rR1:R2 svn://repos/branch

in the working copy of the trunk (assured that there were no local
modifications, and the latest revision was checked out):

- there were files with conflicts that were _not_ changed on the trunk.
the conflicted files were a mess, solved this with 'resolve --accept
theirs-full', but svn should have merged the changes flawlessly.

- there were files on the branch that changed, but weren't merged at all

- there were 4 path conflicts due to file renaming, but this was easy to
sort out

Now the source doesn't compile (resolved all conflicts already), because
old and new versions of the classes are mixed.

I made lists of changed files between R1 and R2 on the trunk, branch,
and the changed files of the merge:

svn diff -rR1:R2 svn://repos/branch|grep ^Index|cut -d " " -f 2|sort >
/tmp/changes-on-branch.txt

svn diff -rR1:R2|grep ^Index|cut -d " " -f 2|sort >
/tmp/changes-on-trunk.txt

svn diff|grep ^Index|cut -d " " -f 2|sort >
/tmp/changes-on-trunk-after-merge.txt

In theory (unless I got something completely wrong) all files listed in
changes-on-branch.txt should be in the trunk-after-merge list (unless
they changed exactly the same way [which is not the case], or were added
on the branch), but the diff shows that a lot of files are missing,
meaning that the merge operation didn't copy the changes from the branch
to the trunk. A lot of these files (not sure whether all) didn't change
on the trunk.

What am I doing wrong?

The svn client is running under debian squeeze, amd64, 1.6.3-dfsg-1.
The svn server is running under debian etch, i386, 1.4.2-dfsg1-3.
The repository is FSFS.

Regards, Peter

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-24 12:06:08 CEST