"Carter Thompson" <cthompso@outerbay.com> wrote on 01/26/2005 04:36:49 PM:
> > -----Original Message-----
> > From: Mark Phippard [mailto:MarkP@softlanding.com]
> >
> [snip]
>
> > Read this:
> >
> > http://svnbook.red-bean.com/en/1.1/ch04s04.html
> >
> > This is what you would probably want:
> >
> > cd trunk
> > svn update
> > svn merge -r25:HEAD http://subversion/svn/prodops/branches/ui-rel-1.0
> >
> > This would cause all of the changes made on the branch to merged into
> your
> > WC of trunk. You then review the merge, resolve conflicts, and
> commit.
> >
>
> Thanks, Mark. Unfortunately, I tried that among other merge attempts.
> Embarassingly, I actually own the Subversion book and have read the
> entire
> chapter on merging and it's just not working for me. When I do the
> above
> I get this:
>
> svn merge -r25:HEAD http://subversion/svn/prodops/branches/ui-rel-1.0
> Skipped missing target: 'src/com/outerbay/ui/UIResources.properties'
> Skipped missing target: 'src/com/outerbay/ui'
> Skipped missing target: 'src/com/outerbay'
> Skipped missing target: 'src/com'
> Skipped missing target: 'src'
>
> Can't figure out why I've got a 'missing target'.
You must not be in the right directory whem you run the command. You need
to be in the WC directory, and "src" should be a sub-directory of the
directory you are in when you run the command.
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 26 22:46:38 2005