Which revisions do I need to merge then? r4379 is the revision that made the
branch.
On Wed, May 21, 2008 at 6:16 PM, marc gonzalez-carnicer <
carnicer.lists_at_gmail.com> wrote:
> you probably did not merge the proper revisions. double check the
> revision numbers.
>
> you may also want to use svnmerge.py.
>
>
> 2008/5/21 yellowbkpk <ian.dees_at_gmail.com>:
> >
> > I made a dev branch (e.g. "dev-branch") off of trunk a couple weeks ago.
> I
> > attempted to merge them today using the Subversion Book process:
> >
> > $ cd work/trunk
> >
> > $ svn up
> > At revision 4549.
> >
> > $ svn merge -r4379:4549 http://svn.x.com/project/branches/dev-branch
> > ...
> >
> > This works, but there are several files that I created on the branch that
> > don't show up in my working copy. They are reported as "Skipped missing
> > target: 'x/y/z'"
> >
> > How can I get these files merged? I am pretty sure they aren't renamed,
> but
> > are in fact brand new files from the branch that need to be added to the
> > trunk.
> >
> > Thanks!
> > --
> > View this message in context:
> http://www.nabble.com/Merging-and-%22Skipped-missing-target%22-tp17375347p17375347.html
> > Sent from the Subversion Users mailing list archive at Nabble.com.
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
> > For additional commands, e-mail: users-help_at_subversion.tigris.org
> >
> >
>
Received on 2008-05-22 01:31:23 CEST