On Mon, 2004-04-26 at 17:27, Simon McClenahan wrote:
> I did the merge as described from the command-line. I'm going to
> assume for now that TortoiseSVN doesn't support this type of merge
> operation. A couple more questions:
>
> - I was surprised to see some files were skipped. Was this because of
> a configuration somewhere, or because svn merge decided? Something to
> do with dot-files?
> Skipped '.classpath'
> Skipped '.project'
>
> - In the trunk, there was a "bin" directory under version control,
> which I svn deleted in my branch. Shouldn't the merge have deleted the
> directory, or at least the hidden .svn dir? I have another branch
> where I am doing some major re-organizing of directories and file
> moving. Should I be anticipating problems like this when I merge back
> to the trunk?
'svn merge' *does* understand additions, deletions, copies, and renames.
Both of these descriptions are classic symptoms of an "unclean patch".
In other words, you're comparing two trees (say, tree A and tree B), and
the resulting diff is a patch which doesn't cleanly apply to your
working copy.
When you see messages about skipping, it typically means that tree A and
tree B both have an object, but your working copy doesn't. For example,
if the comparison between tree A and tree B results in a patch which
says, "make this tweak to foo.c", but your working copy has no such
file, then you get a "skipped" message. It's analogous to the 'patch'
program complaining about "failed hunks".
Similarly, are you *sure* that a comparison between tree A and tree B
would include a deletion of the 'bin' dir? Try 'svn ls'ing the two
trees to verify.
The upshot here is that you've somehow compared the wrong two trees,
and/or tried to apply the patch to the wrong working copy location.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 27 00:43:52 2004