Merging not working correctly

Hello.

I'm having difficulty doing a merge.

I have a project trunk and one branch:

 file:///source/cland/cpject/trunk
 file:///source/cland/cpject/branches/multidir

I am following this link as a basic guide:

http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.1

I go into the project trunk:

 $ cd trunk
 $ svn status
 $ svn up
 At revision 156.
 $ svn log --stop-on-copy file:///source/cland/cpject/branches/multidir
 ------------------------------------------------------------------------
 r156 | mzero | 2006-05-07 21:09:26 +0100 (Sun, 07 May 2006) | 3 lines

 final update, see CHANGES for details.
 ...
 (rest of log removed)

The multidir branch was created at revision 135. I am attempting to
merge the multidir branch into the (completely untouched since the
branch) trunk.

Now the problem I am having is that certain files just don't want to
be merged and I don't know why. There have definitely been changes
committed between the trunk and the branch:

 (still in trunk)
 $ svn log cpj-gentarg.c
 ------------------------------------------------------------------------
 r132 | mzero | 2006-05-05 11:33:28 +0100 (Fri, 05 May 2006) | 3 lines

 basic input

 $ svn log file:///source/cland/cpject/branches/multidir/cpj-gentarg.c
 ------------------------------------------------------------------------
 r135 | mzero | 2006-05-07 09:56:57 +0100 (Sun, 07 May 2006) | 3 lines

 squashed target bug (see CHANGES)

Even a simple diff shows:

 $ diff cpj-gentarg.c ../branches/multidir/cpj-gentarg.c
 87,92d69
>
> CLEANUP:
> if (flag_chdir)
> if (fchdir(fd) == -1) syserr_warn2sys(progname, ": warn: fchdir: ");
>
> return 112;

Now, to attempt the merge the entire multidir branch into the trunk:

 $ svn merge --dry-run -r135:HEAD file:///source/cland/cpject/branches/multidir
 (lots of files snipped)

There is absolutely no mention of cpj-gentarg.c in the merge output!
Why is this?

There are even some conflicts, which I don't understand at all. I
stress: The trunk hasn't been touched since the branch was created.
Unless there's a huge gap in my understanding, how can there
possibly be conflicts?

Perhaps I'm doing something incredibly wrong.
Any help would be appreciated.
M

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun May 7 23:03:08 2006