Re: Merge problem where a file is skipped

On 9/18/07, Vlad Georgescu <vgeorgescu@gmail.com> wrote:
> Mark Phippard wrote:
> > $ svn merge $R/branches/dummy $R/trunk trunk
> > --- Merging r3:
> > Skipped missing target: 'trunk/bar'
> > G trunk
> > $
> >
> > In the last step, I think that "bar" should have been added, not skipped.
> >
>
> Shouldn't the merge be:
> svn merge $R/trunk $R/branches/dummy trunk

Note to self, don't try to recreate problems before AM coffee.

Thanks Vlad.

Mark Phippard
http://markphip.blogspot.com/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 18 14:59:07 2007