Re: How to recover deleted directory in repository?
On Oct 9, 2011, at 00:45, Geoff Hoffman wrote: > On Sat, Oct 8, 2011 at 8:38 PM, Xiang Liu wrote: > >> I have removed a directory by mistake. >> >> > svn del https://pl3.projectlocker.com/gnwd/notes/svn/a_dir >> >> So, How can I recover it? > > What I would do is pick a new location on your machine and export the parent > directory of where your directory used to be (the svn dir above?) and force > the revision number of the repository to be what it was, when a_dir used to > exist. If your repo is at -r 10 now but the folder existed at -r 9, do > something like: > > #> cd /other/dir > #> svn export https://pl3.projectlocker.com/gnwd/notes/svn -r 9 svn > Exported revision 9 > > now you will have a new svn folder at /other/dir/svn, you can then copy the > a_dir inside there back to your working copy and commit it back to the > repository > > cp svn/a_dir /path/to/workingcopy/gnwd/notes/svn/ > > now if you cd to your working copy dir and do a svn status, you can see these > a_dir files are just a new unversioned directory > > #> cd /path/to/workingcopy/gnwd/notes/svn > #> svn add a_dir > A foo.c > A bar.c > etc > #> svn commit -m "Restored a_dir" > Committed revision 11. If you do it that way, it will appear to Subversion (and yourself later, when you review the history) as though you created the directory an all its contents in revision 11. It will be completely disconnected from its previous history in the repository. "svn log" on this new directory will only go back to revision 11. "svn blame" will show it was created in revision 11. This is probably not what you want. You probably want to bring the directory back from the past, linked with all its prior history. To do that, instead copy it from its prior repository location with svn cp: cd /path/to/workingcopy/gnwd/notes/svn svn cp https://pl3.projectlocker.com/gnwd/notes/svn/a_dir@9 . # test, test, test svn ci -m "resurrecting a_dir from revision 9"
Re: How to recover deleted directory in repository?
On Sun, Oct 9, 2011 at 1:00 AM, Ryan Schmidt < subversion-20...@ryandesign.com> wrote: > On Oct 9, 2011, at 00:45, Geoff Hoffman wrote: > > > On Sat, Oct 8, 2011 at 8:38 PM, Xiang Liu wrote: > > > >> I have removed a directory by mistake. > >> > >> > svn del https://pl3.projectlocker.com/gnwd/notes/svn/a_dir > >> > >> So, How can I recover it? > > > > What I would do is pick a new location on your machine and export the > parent directory of where your directory used to be (the svn dir above?) and > force the revision number of the repository to be what it was, when a_dir > used to exist. If your repo is at -r 10 now but the folder existed at -r 9, > do something like: > > > > #> cd /other/dir > > #> svn export https://pl3.projectlocker.com/gnwd/notes/svn -r 9 svn > > Exported revision 9 > > > > now you will have a new svn folder at /other/dir/svn, you can then copy > the a_dir inside there back to your working copy and commit it back to the > repository > > > > cp svn/a_dir /path/to/workingcopy/gnwd/notes/svn/ > > > > now if you cd to your working copy dir and do a svn status, you can see > these a_dir files are just a new unversioned directory > > > > #> cd /path/to/workingcopy/gnwd/notes/svn > > #> svn add a_dir > > A foo.c > > A bar.c > > etc > > #> svn commit -m "Restored a_dir" > > Committed revision 11. > > If you do it that way, it will appear to Subversion (and yourself later, > when you review the history) as though you created the directory an all its > contents in revision 11. It will be completely disconnected from its > previous history in the repository. "svn log" on this new directory will > only go back to revision 11. "svn blame" will show it was created in > revision 11. This is probably not what you want. You probably want to bring > the directory back from the past, linked with all its prior history. > > To do that, instead copy it from its prior repository location with svn cp: > > cd /path/to/workingcopy/gnwd/notes/svn > svn cp https://pl3.projectlocker.com/gnwd/notes/svn/a_dir@9 . > # test, test, test > svn ci -m "resurrecting a_dir from revision 9" > > Ryan, your way is better. I thought that would create commit conflicts though. It doesn't?
Re: Problem when commiting with svnmirrors
Dominik Psenner gmail.com> writes: > > I’m unsure if this > really matters, but there exists a commercial product that enables svn > morroring with writeable mirrors by using the paxos algorithm. > And the product name is ...
Re: svnsync UTF8 problem
So, has no one seen this problem before? I guess I'll have to open a bug report. -- Srdan Dukic On 5 October 2011 11:38, Srdan Dukic wrote: > Hi, > > I'm using svnsync to mirror a repository and am doing the initial > synchronization, when I get the following error: > > Transmitting file data .svnsync: At least one property change failed; > repository is unchanged > svnsync: Error setting property 'log': > Could not execute PROPPATCH.Error setting property 'author': > Attempted DAV:set operation could not be completed due to other > errors.Error setting property 'date': > Attempted DAV:set operation could not be completed due to other errors. > > On the mirror side, I get the following from the Apache logs: > > [Wed Oct 05 09:46:47 2011] [error] [client 192.168.1.11] Could not execute > PROPPATCH. [500, #206] > [Wed Oct 05 09:46:47 2011] [error] [client 192.168.1.11] Cannot accept > 'svn:log' property because it is not encoded in UTF-8 [500, #125005] > [Wed Oct 05 09:46:47 2011] [error] [client 192.168.1.11] Attempted DAV:set > operation could not be completed due to other errors. [424, #0] > [Wed Oct 05 09:46:47 2011] [error] [client 192.168.1.11] Attempted DAV:set > operation could not be completed due to other errors. [424, #0] > > I've tried converting the 'svn:log' property to UTF8 and syncing as > described at: > > > https://help.codesion.com/View.jsp?title=How-to-Deal-with-Svn-Backups-Failing-Due-to-UTF8-Error&procId=fc29d38015b4321e01b645a2e02ae5e9 > > but still end up getting the same error. I've also tried deleting the > 'svn:log' property altogether using 'propdel', but to my surprise, I still > get the same error. > > The actual value of the svn:log property is: > > "When printing a form through the full task list the client's TEF number > has and beside it (for cds)." > > Which doesn't have any characters that should need any UTF8 handling. > > Has anyone else had this problem? If so, how did you solve it? > > The version of both of the subversion source and mirror are 1.6.11 and the > command line tools are also this version. > > Thank you > -- > Srdan Dukic >
Re: How to recover deleted directory in repository?
2011/10/9 Xiang Liu : > Hi, everybody > > I have removed a directory by mistake. > >> svn del https://pl3.projectlocker.com/gnwd/notes/svn/a_dir > > So, How can I recover it? http://subversion.apache.org/faq.html#undo http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.resurrect Best regards, Konstantin Kolinko
Re: How to recover deleted directory in repository?
On Oct 9, 2011, at 08:32, Geoff Hoffman wrote: >> If you do it that way, it will appear to Subversion (and yourself later, >> when you review the history) as though you created the directory an all its >> contents in revision 11. It will be completely disconnected from its >> previous history in the repository. "svn log" on this new directory will >> only go back to revision 11. "svn blame" will show it was created in >> revision 11. This is probably not what you want. You probably want to bring >> the directory back from the past, linked with all its prior history. >> >> To do that, instead copy it from its prior repository location with svn cp: >> >> cd /path/to/workingcopy/gnwd/notes/svn >> svn cp https://pl3.projectlocker.com/gnwd/notes/svn/a_dir@9 . >> # test, test, test >> svn ci -m "resurrecting a_dir from revision 9" > > Ryan, your way is better. I thought that would create commit conflicts > though. It doesn't? How do you mean?
RE: Problem when commiting with svnmirrors
>And the product name is ... If I remembered, I would have posted it. It was _probably_ WANdisco.. please use your favourite web search engine to find out more. Regards, D.
Re: svnsync UTF8 problem
Srdan Dukic wrote on Mon, Oct 10, 2011 at 11:11:08 +1300: > So, has no one seen this problem before? I guess I'll have to open a bug > report. > No. Rejecting non-utf-8 properties is a common problem. Please don't open a bug report for it. (more below) > -- > Srdan Dukic > > On 5 October 2011 11:38, Srdan Dukic wrote: > > > Hi, > > > > I'm using svnsync to mirror a repository and am doing the initial > > synchronization, when I get the following error: > > > > Transmitting file data .svnsync: At least one property change failed; > > repository is unchanged > > svnsync: Error setting property 'log': > > Could not execute PROPPATCH.Error setting property 'author': > > Attempted DAV:set operation could not be completed due to other > > errors.Error setting property 'date': > > Attempted DAV:set operation could not be completed due to other errors. > > > > On the mirror side, I get the following from the Apache logs: > > > > [Wed Oct 05 09:46:47 2011] [error] [client 192.168.1.11] Could not execute > > PROPPATCH. [500, #206] > > [Wed Oct 05 09:46:47 2011] [error] [client 192.168.1.11] Cannot accept > > 'svn:log' property because it is not encoded in UTF-8 [500, #125005] > > [Wed Oct 05 09:46:47 2011] [error] [client 192.168.1.11] Attempted DAV:set > > operation could not be completed due to other errors. [424, #0] > > [Wed Oct 05 09:46:47 2011] [error] [client 192.168.1.11] Attempted DAV:set > > operation could not be completed due to other errors. [424, #0] > > > > I've tried converting the 'svn:log' property to UTF8 and syncing as > > described at: > > > > > > https://help.codesion.com/View.jsp?title=How-to-Deal-with-Svn-Backups-Failing-Due-to-UTF8-Error&procId=fc29d38015b4321e01b645a2e02ae5e9 > > > > but still end up getting the same error. I've also tried deleting the > > 'svn:log' property altogether using 'propdel', but to my surprise, I still > > get the same error. > > Odd. Perhaps some other revision property of that revision contains non-UTF-8? > > The actual value of the svn:log property is: > > > > "When printing a form through the full task list the client's TEF number > > has and beside it (for cds)." > > > > Which doesn't have any characters that should need any UTF8 handling. > > svn propget --revprop -rN --strict svn:log | xxd > > Has anyone else had this problem? If so, how did you solve it? > > svnsync sync --source-prop-encoding > > The version of both of the subversion source and mirror are 1.6.11 and the > > command line tools are also this version. > > > > Thank you > > -- > > Srdan Dukic > >
