On May 7, 2006, at 23:01, mal content wrote:
> 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)
From the log, it looks like you squashed a bug in r135. So then you
must have created the branch in a different revision? Or did you do
both of these tasks at once?
> $ 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?
How was the branch initially created? Did you use repository URLs,
like this:
svn cp file:///source/cland/cpject/trunk \
file:///source/cland/cpject/branches/multidir \
-m "Creating multidir branch"
Or did you create the branch by copying a *working copy* of trunk? If
the latter, could it be that the working copy already had other
changes made in it which had not yet been committed to the trunk? If
so, that might account for the problem -- since the revision in which
the branch was created never matched any committed revision of the
trunk, merges will now be rather problematic. See this recent thread:
http://svn.haxx.se/users/archive-2006-04/1105.shtml
---------------------------------------------------------------------
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:39:37 2006