Re: Merging question

Please note that there are only three arguments, but not the ones you
think:
--dry-run
file:///repos/trunk_at_12
file:///repos/trunk_at_HEAD

The other line is the result of the merge:
   src\java\core\net\sourceforge\jgb\builder\Builder.java

Wrapping caused the confusion.

Thanks,
François

On 26 Jun 2003 09:50:27 -0500, "Ben Collins-Sussman" <sussman@collab.net>
said:
> "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
>
>

--
  Francois Beausoleil
  Developer of Java Gui Builder
  http://jgb.sourceforge.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org