You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Ben Collins-Sussman <su...@collab.net> on 2003/06/26 14:50:27 UTC
Re: Merging question
"Francois Beausoleil" <fb...@users.sourceforge.net> writes:
> E:\harry>svn merge --dry-run file:///repos/trunk@12
> file:///repos/trunk@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
Re: Merging question
Posted by Francois Beausoleil <fb...@users.sourceforge.net>.
Please note that there are only three arguments, but not the ones you
think:
--dry-run
file:///repos/trunk@12
file:///repos/trunk@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" <su...@collab.net>
said:
> "Francois Beausoleil" <fb...@users.sourceforge.net> writes:
>
> > E:\harry>svn merge --dry-run file:///repos/trunk@12
> > file:///repos/trunk@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