Weird merge issue

[Gavin 'Beau' Baumanis <be...@palcare.com.au>]

Hi Everyone,

I am using svn 1.5.1 for the server and 1.5.2 for the command line  
client.

I removed a folder and committed the change using the following;

svn rm branches/folder1
svn commit -m '......'

I then realised I had removed the wrong directory.

And attempted to reverse the last commit;
cd /svnroot
svn merge -c -xx branches

The merge didn't work. it reported;
Skipped missing target: 'pathname'

Followed by a skipped message for all sub directories in /svnroot/ 
branches/pathname

However the deleted directory and sub-directories are still missing.

svn update performs no work
svn status reports no differences.

As always - thanks for any help you might be able to provide.

Beau.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Weird merge issue

[Ryan Schmidt <su...@ryandesign.com>]

"svnadmin verify" verifies that your repository is ok.

I do not know why the reverse merge of the revision in which the  
deletion occurred did not work for you. But the other way to bring  
back a deleted directory is to just copy it from a revision in which  
it did exist.

So if you deleted the directory in r100 then you can bring it back with:

svn cp url://to/some/path/directory@99 url://to/some/path/ -m "un- 
deleting directory (copying it from r99)"



On Oct 7, 2008, at 18:10, Gavin 'Beau' Baumanis wrote:

> Well I have a few updates that don't make much sense to me...
>
> I tried to use svn merge -r xx-1:xx but unsurprisingly, that gave  
> me the same results as the -c -xx version of the command.
>
> I then decided the only way ut, was going to be delete the working  
> copy and then checkout a new one - specifying the revision prior to  
> the accidental delete;
> svn co http://...  destinationPathName -r xx-1
>
> It seemed to work fine and dandy until it got into the branch   
> (where I was having the original issues).
> It gave me the following error message;
> svn: Failed to add directory 'palcare/branches': an unversioned  
> directory of the same name already exists
>
> now since I completely removed the palcare directory;
> sudo rm -r palcare
> (and I confirmed that it certainly was not there prior to doing the  
> checkout)
>
> I am wondering, how on earth did the branches directory and a  
> single sub directory of the branches directory suddenly appear?
> It is not in the user feedback from the checkout operation that the  
> branches directory was added...
>
> Subsequently I did;
> svn update branches -r xx-1 and that sort of worked... in so far as  
> all directories but one has been added to my WC.
> which I had to add manually and then update into.
> Without the pre-creation of the directory it added the contents of  
> that missing directory into the root of the branches directory.
>
> I am still none the wiser as to how it happened or why it is still  
> misbehaving, considering I am doing a fresh checkout.
>
> What are the chances of there being a repository issue, as opposed  
> to a working copy issue?
>
> and if this is likely - is there an appropriate command / set of  
> commands that I should run to ensure the ongoing health of the  
> repository?
>
> Thanks again.
>
> Beau
>
> On 07/10/2008, at 10:19 PM, Gavin 'Beau' Baumanis wrote:
>
>> Hi Everyone,
>>
>> I am using svn 1.5.1 for the server and 1.5.2 for the command line  
>> client.
>>
>> I removed a folder and committed the change using the following;
>>
>> svn rm branches/folder1
>> svn commit -m '......'
>>
>> I then realised I had removed the wrong directory.
>>
>> And attempted to reverse the last commit;
>> cd /svnroot
>> svn merge -c -xx branches
>>
>> The merge didn't work. it reported;
>> Skipped missing target: 'pathname'
>>
>> Followed by a skipped message for all sub directories in /svnroot/ 
>> branches/pathname
>>
>> However the deleted directory and sub-directories are still missing.
>>
>> svn update performs no work
>> svn status reports no differences.
>>
>> As always - thanks for any help you might be able to provide.
>>
>> Beau.
>>
>> ---------------------------------------------------------------------
>> 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
>


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Weird merge issue

[Gavin 'Beau' Baumanis <ga...@thespidernet.com>]

Well I have a few updates that don't make much sense to me...

I tried to use svn merge -r xx-1:xx but unsurprisingly, that gave me  
the same results as the -c -xx version of the command.

I then decided the only way ut, was going to be delete the working  
copy and then checkout a new one - specifying the revision prior to  
the accidental delete;
svn co http://...  destinationPathName -r xx-1

It seemed to work fine and dandy until it got into the branch  (where  
I was having the original issues).
It gave me the following error message;
svn: Failed to add directory 'palcare/branches': an unversioned  
directory of the same name already exists

now since I completely removed the palcare directory;
sudo rm -r palcare
(and I confirmed that it certainly was not there prior to doing the  
checkout)

I am wondering, how on earth did the branches directory and a single  
sub directory of the branches directory suddenly appear?
It is not in the user feedback from the checkout operation that the  
branches directory was added...

Subsequently I did;
svn update branches -r xx-1 and that sort of worked... in so far as  
all directories but one has been added to my WC.
which I had to add manually and then update into.
Without the pre-creation of the directory it added the contents of  
that missing directory into the root of the branches directory.

I am still none the wiser as to how it happened or why it is still  
misbehaving, considering I am doing a fresh checkout.

What are the chances of there being a repository issue, as opposed to  
a working copy issue?

and if this is likely - is there an appropriate command / set of  
commands that I should run to ensure the ongoing health of the  
repository?

Thanks again.

Beau

On 07/10/2008, at 10:19 PM, Gavin 'Beau' Baumanis wrote:

> Hi Everyone,
>
> I am using svn 1.5.1 for the server and 1.5.2 for the command line  
> client.
>
> I removed a folder and committed the change using the following;
>
> svn rm branches/folder1
> svn commit -m '......'
>
> I then realised I had removed the wrong directory.
>
> And attempted to reverse the last commit;
> cd /svnroot
> svn merge -c -xx branches
>
> The merge didn't work. it reported;
> Skipped missing target: 'pathname'
>
> Followed by a skipped message for all sub directories in /svnroot/ 
> branches/pathname
>
> However the deleted directory and sub-directories are still missing.
>
> svn update performs no work
> svn status reports no differences.
>
> As always - thanks for any help you might be able to provide.
>
> Beau.
>
> ---------------------------------------------------------------------
> 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