You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Bob Peterson <bo...@memento-inc.com> on 2005/12/22 16:43:52 UTC
svn merge reports skipped misisng fictional files
I just don't grok Subversion sometimes. Here I try to merge and get an
error about a fictional extra subfolder.
svn mkdir http://server/svn/src/branches/bob
This one I grok. It makes a folder named "bob".
svn copy http://server/svn/src/trunk/xyz
http://server/svn/src/branches/bob/xyz
I grok this too. When I checkout bob I get a folders bob and bob/xyz and
their contents alright. I even see the repository looking normal when I
list it.
svn merge -r 7394:7401 http://server/svn/src/trunk
But when I try to merge from trunk I get the error for skipping two
missing targets, mysteriously named "...bob\xyz\xyz\file1.cs" and
"...bob\xyz\xyz\file2.resx". This extra layer of \xyz\ makes no sense.
There was never such an extra subfolder that I can recall, but maybe
there was in the far gone mists of time. Long before I did the mkdir.
This smells faintly of another of my recently reported problems with
merge. I blew away the old branch and started from a fresh copy.
"Fortunately" I ran into -this- S.N.A.F.U. before I started developing
in the new branch.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn merge reports skipped misisng fictional files
Posted by kf...@collab.net.
Bob Peterson <bo...@memento-inc.com> writes:
> I just don't grok Subversion sometimes. Here I try to merge and get
> an error about a fictional extra subfolder.
>
> svn mkdir http://server/svn/src/branches/bob
> This one I grok. It makes a folder named "bob".
>
> svn copy http://server/svn/src/trunk/xyz
> http://server/svn/src/branches/bob/xyz
> I grok this too. When I checkout bob I get a folders bob and bob/xyz
> and their contents alright. I even see the repository looking normal
> when I list it.
>
> svn merge -r 7394:7401 http://server/svn/src/trunk
> But when I try to merge from trunk I get the error for skipping two
> missing targets, mysteriously named "...bob\xyz\xyz\file1.cs" and
> "...bob\xyz\xyz\file2.resx". This extra layer of \xyz\ makes no
> sense. There was never such an extra subfolder that I can recall, but
> maybe there was in the far gone mists of time. Long before I did the
> mkdir. This smells faintly of another of my recently reported
> problems with merge. I blew away the old branch and started from a
> fresh copy. "Fortunately" I ran into -this- S.N.A.F.U. before I
> started developing in the new branch.
Well, at the risk of sounding cold and cruel... Can you script this up
as a reproducible bug? If so, we can probably fix it.
-Karl
--
www.collab.net <> CollabNet | Distributed Development On Demand
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn merge reports skipped misisng fictional files
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Dec 22, 2005, at 21:16, Lieven Govaerts wrote:
>> svn mkdir http://server/svn/src/branches/bob
>> This one I grok. It makes a folder named "bob".
>>
>> svn copy http://server/svn/src/trunk/xyz
>> http://server/svn/src/branches/bob/xyz
>> I grok this too. When I checkout bob I get a folders bob and
>> bob/xyz and their contents alright. I even see the
>> repository looking normal when I list it.
>>
>> svn merge -r 7394:7401 http://server/svn/src/trunk But
>> when I try to merge from trunk I get the error for skipping
>> two missing targets, mysteriously named
>> "...bob\xyz\xyz\file1.cs" and "...bob\xyz\xyz\file2.resx".
>> This extra layer of \xyz\ makes no sense.
>> There was never such an extra subfolder that I can recall, but maybe
>> there was in the far gone mists of time. Long before I did
>> the mkdir.
>
> Isn't there one extra xyz folder created in your copy step?
>
> I'm not sure, but shouldn't you use this:
> svn copy http://server/svn/src/trunk/xyz
> http://server/svn/src/branches/bob/
That sounds like it could be the beginning of an explanation. To
continue, the problem is that this command has two possible outcomes:
svn copy \
http://server/svn/src/trunk/xyz \
http://server/svn/src/branches/bob/xyz
1) If branches/bob/xyz does not exist, then this command creates
branches/bob/xyz and copies the contents of trunk/xyz into it.
2) If branches/bob/xyz already exists, then this command creates
branches/bob/xyz/xyz and copies the contents of trunk/xyz into it.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn merge reports skipped misisng fictional files
Posted by Bob Peterson <bo...@memento-inc.com>.
Not according to svn ls.
Lieven Govaerts wrote:
>Isn't there one extra xyz folder created in your copy step?
>
>I'm not sure, but shouldn't you use this:
>svn copy http://server/svn/src/trunk/xyz
> http://server/svn/src/branches/bob/
> ( skip the xyz here )
>
>Lieven.
>
>
>
>>-----Original Message-----
>>From: Bob Peterson [mailto:bob@memento-inc.com]
>>Sent: donderdag 22 december 2005 17:44
>>To: users@subversion.tigris.org
>>Subject: svn merge reports skipped misisng fictional files
>>
>>I just don't grok Subversion sometimes. Here I try to merge
>>and get an error about a fictional extra subfolder.
>>
>> svn mkdir http://server/svn/src/branches/bob
>>This one I grok. It makes a folder named "bob".
>>
>> svn copy http://server/svn/src/trunk/xyz
>>http://server/svn/src/branches/bob/xyz
>>I grok this too. When I checkout bob I get a folders bob and
>>bob/xyz and their contents alright. I even see the
>>repository looking normal when I list it.
>>
>> svn merge -r 7394:7401 http://server/svn/src/trunk But
>>when I try to merge from trunk I get the error for skipping
>>two missing targets, mysteriously named
>>"...bob\xyz\xyz\file1.cs" and "...bob\xyz\xyz\file2.resx".
>>This extra layer of \xyz\ makes no sense.
>>There was never such an extra subfolder that I can recall, but maybe
>>there was in the far gone mists of time. Long before I did
>>the mkdir.
>>
>>This smells faintly of another of my recently reported
>>problems with merge. I blew away the old branch and started
>>from a fresh copy.
>>"Fortunately" I ran into -this- S.N.A.F.U. before I started
>>developing in the new branch.
>>
>>
>>---------------------------------------------------------------------
>>To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>>For additional commands, e-mail: users-help@subversion.tigris.org
>>
>>--
>>No virus found in this incoming message.
>>Checked by AVG Free Edition.
>>Version: 7.1.371 / Virus Database: 267.14.3/209 - Release
>>Date: 21/12/2005
>>
>>
>>
>>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: svn merge reports skipped misisng fictional files
Posted by Lieven Govaerts <lg...@mobsol.be>.
Isn't there one extra xyz folder created in your copy step?
I'm not sure, but shouldn't you use this:
svn copy http://server/svn/src/trunk/xyz
http://server/svn/src/branches/bob/
( skip the xyz here )
Lieven.
> -----Original Message-----
> From: Bob Peterson [mailto:bob@memento-inc.com]
> Sent: donderdag 22 december 2005 17:44
> To: users@subversion.tigris.org
> Subject: svn merge reports skipped misisng fictional files
>
> I just don't grok Subversion sometimes. Here I try to merge
> and get an error about a fictional extra subfolder.
>
> svn mkdir http://server/svn/src/branches/bob
> This one I grok. It makes a folder named "bob".
>
> svn copy http://server/svn/src/trunk/xyz
> http://server/svn/src/branches/bob/xyz
> I grok this too. When I checkout bob I get a folders bob and
> bob/xyz and their contents alright. I even see the
> repository looking normal when I list it.
>
> svn merge -r 7394:7401 http://server/svn/src/trunk But
> when I try to merge from trunk I get the error for skipping
> two missing targets, mysteriously named
> "...bob\xyz\xyz\file1.cs" and "...bob\xyz\xyz\file2.resx".
> This extra layer of \xyz\ makes no sense.
> There was never such an extra subfolder that I can recall, but maybe
> there was in the far gone mists of time. Long before I did
> the mkdir.
>
> This smells faintly of another of my recently reported
> problems with merge. I blew away the old branch and started
> from a fresh copy.
> "Fortunately" I ran into -this- S.N.A.F.U. before I started
> developing in the new branch.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
> --
> No virus found in this incoming message.
> Checked by AVG Free Edition.
> Version: 7.1.371 / Virus Database: 267.14.3/209 - Release
> Date: 21/12/2005
>
>
--
No virus found in this outgoing message.
Checked by AVG Free Edition.
Version: 7.1.371 / Virus Database: 267.14.3/209 - Release Date: 21/12/2005
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org