You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by yellowbkpk <ia...@gmail.com> on 2008/05/21 21:19:44 UTC
Merging and "Skipped missing target"
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@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merging and "Skipped missing target"
Posted by Ryan Schmidt <su...@ryandesign.com>.
What are the revisions in which you created the files on the branch
that aren't showing up in the merge? If you created them between 4379
and 4549, they should be showing up in the merge, just like every
other change made in that range.
On May 21, 2008, at 18:30, Ian Dees wrote:
> 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 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:
>>
>> > 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: Merging and "Skipped missing target"
Posted by "Srilakshmanan, Lakshman" <la...@police.vic.gov.au>.
Hi Ian,
What revision did you create the "missing targets"
Thanks
Lakshman
________________________________
From: Ian Dees [mailto:ian.dees@gmail.com]
Sent: Thursday, 22 May 2008 9:31 AM
To: marc gonzalez-carnicer
Cc: users@subversion.tigris.org
Subject: Re: Merging and "Skipped missing target"
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
<ca...@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 <ia...@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-tp1737534
7p17375347.html
> Sent from the Subversion Users mailing list archive at
Nabble.com.
>
>
>
---------------------------------------------------------------------
> To unsubscribe, e-mail:
users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail:
users-help@subversion.tigris.org
>
>
================================================================================================
EMAIL DISCLAIMER
This email and any attachments are confidential. They may also be subject to copyright.
If you are not an intended recipient of this email please immediately contact us by replying
to this email and then delete this email.
You must not read, use, copy, retain, forward or disclose this email or any attachment.
We do not accept any liability arising from or in connection with unauthorised use or disclosure
of the information contained in this email or any attachment.
We make reasonable efforts to protect against computer viruses but we do not accept liability
for any liability, loss or damage caused by any computer virus contained in this email.
================================================================================================
Re: Merging and "Skipped missing target"
Posted by Ian Dees <ia...@gmail.com>.
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@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 <ia...@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@subversion.tigris.org
> > For additional commands, e-mail: users-help@subversion.tigris.org
> >
> >
>
Re: Merging and "Skipped missing target"
Posted by marc gonzalez-carnicer <ca...@gmail.com>.
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 <ia...@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@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merging and "Skipped missing target"
Posted by marc gonzalez-carnicer <ca...@gmail.com>.
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 <ia...@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@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org