Re: Merging question

"Francois Beausoleil" <fbos@users.sourceforge.net> writes:

> E:\harry>svn merge --dry-run file:///repos/trunk_at_12
> file:///repos/trunk_at_HEAD
> src\java\core\net\sourceforge\jgb\builder\Builder.java
>
> I expected SVN to tell me the file would be updated. So, why didn't it
> tell me so ? Here's the history of the file:

I think the problem here is that you're asking 'svn merge' to compare
two directories, but then to apply the diffs to a *file*. That makes
no sense. All three arguments need to be the same node-type.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jun 26 18:52:30 2003