Re: Recovering repository with multiple missing rev/ files

[Daniel Shahaf]

Eiren Smith wrote on Thu, 17 Jun 2010 at 23:24 -:
> On Jun 15, 2010, at 12:20 PM, Eiren Smith wrote:
> 
> > On Jun 15, 2010, at 12:14 PM, Stefan Sperling wrote:
> > 
> > > On Tue, Jun 15, 2010 at 11:49:44AM -0400, Eiren Smith wrote:
> > > > Sir:
> > > > 
> > > > Thanks for your reply. I'll read those references you cited.
> > > > 
> > > > > > 
> > > > > > P.S. Other files may also be missing from the revprops/ dir, not
> > > > > > just 7437 -- If I'm willing to lose commit messages, can I live
> > > > > > without some revprops/ files?
> > > > > 
> > > > > You should recreate the revprops for all revisions.
> > > > 
> > > > I have emails messages (from SubversionNotify) containing the commit
> > > > comments for six of seven of those revisions. If I can rebuild the
> > > > repository with some revprops/ files missing, I can edit the
> > > > comments later. Will this work?
> > > 
> > > Sure, that will work. You'll need to do a manual commit of the changes
> > > made in lost revisions, and then tweak the revision properties after the
> > > commit is done. See also the 'svnadmin setrevprop' command, which will
> > > help you to set the revision properties (svn:date, svn:author, and
> > > svn:log).
> > > 
> > > Stefan
> > 
> > Thank you.
> > 
> > I won't be able to accurately mimic the seven missing changes as most of
> > them were for binary files (project documentation and some DLLs).
> > 
> > Instead, is there a way to simply say "All future revisions that depend
> > upon these seven revisions are dead/null" so I can piece the repo back
> > together with just that minor loss?
> > 
> > Thanks,
> > 
> > /eiren
> 
> 
> Anyone:
> 
> Any ideas about how to handle this since I can't mimic the changes to the
> binary files modified in the missing revs?
> 

Patch svnadmin to skip those particular files (hard-code them) when
parsing a dumpfile?

> Sorry if nudging this is bad form for this list.
> 
> /eiren
> 

Re: hi ..

[Ulrich Eckhardt]

On Friday 18 June 2010, amit kumar wrote:
> I am getting always an error while installing project from google repositry
> ..
>
>  Open SVN Repository perspective
> - Right click on the left side and go to new -> repository location...
> - URL: https://quantdesk.googlecode.com/svn/trunk
> - Press Finish
> - Open the repository, right click on QuantDesk_UI
> - Click Checkout...

These steps relate to some other client than the one provided by Subversion 
itself, so this might be an issue with that. Try this with the commandline 
client:

   svn ls https://quantdesk.googlecode.com/svn/trunk

You should get a list with a bunch of directories stored at that URL. If not, 
post the error output of that command.

Uli

-- 
ML: http://subversion.tigris.org/mailing-list-guidelines.html
FAQ: http://subversion.tigris.org/faq.html
Docs: http://svnbook.red-bean.com/

Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932

**
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**
   Visit our website at 
**
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten 
bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen 
Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein 
sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, 
weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte 
Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht 
verantwortlich.
**

Re: Tagging multiple projects within one revision using svn:externals possible bug

[Sergii Ostroverkhov]

Thanks for simple option 1, it could solve our problem.
Option 2 doesn't fit, cause of needing to do bunch of "svn copy ..." to tag
all projects and then tag to BigProject with pinned externals.
Of course it could be done without tagging all projects, just pinning
externals to revision of trunk, but it is too complicated to automate.
And last question, is it a bug when I got the message "svn:
'BigProject-trunks\Project1' is not under version control", when I want to
svn copy multiple svn:externals paths to url?


On Mon, Jun 14, 2010 at 7:14 PM, Bob Archer  wrote:

> Option 1:
>
> Created a nested project folder layout:
>
> /Bigproject9/trunk
>   SubProject1/trunk
>  /branches
>  /tags
>   Subproject2/trunk
>  /branches
>  /tags
>/branches
>/tags
>
> Option 2:
>
> Create a folder in the root of the repo BigProject9Tags that is nothing
> more than a folder for each release with pinned externals to the versions of
> each sub project tags that are included in the bigproject release version.
>
> BOb
>

Installation Link

[Daga, Rohit]

Hi All,

>From where I can download the Tortoise Subversion.

Request you to please share the URL.


Regards
Rohit


This message and all attachments are confidential. Any unauthorized review, 
use, disclosure, or distribution is prohibited. If you believe this message has 
been sent to you by mistake, please notify the sender by replying to this 
transmission, and delete the message and its attachments without disclosing 
them.

Re: Installation Link

[vishwajeet singh]

On Fri, Jun 18, 2010 at 12:58 PM, Daga, Rohit wrote:

>  Hi All,
>
>
>
> From where I can download the Tortoise Subversion.
>
>
>
> Request you to please share the URL.
>
http://tortoisesvn.net/downloads


>
>
>
>
> Regards
>
> Rohit
>
>
> This message and all attachments are confidential. Any unauthorized review,
> use, disclosure, or distribution is prohibited. If you believe this message
> has been sent to you by mistake, please notify the sender by replying to
> this transmission, and delete the message and its attachments without
> disclosing them.
>



-- 
Vishwajeet Singh
+91-9657702154 | dextrou...@gmail.com | http://bootstraptoday.com
Twitter: http://twitter.com/vishwajeets | LinkedIn:
http://www.linkedin.com/in/singhvishwajeet

RE: Installation Link

[Daga, Rohit]

Hi,

I have already installed 
TortoiseSVN-1.6.8.19260-x64-svn-1.6.11.msi
 , but also required Subversion to install it and use it but couldn't able to 
get it or if I am doing something wrong request you to guide me.
I am referring this link http://www.west-wind.com/presentations/subversion/ to 
install it on my system and integrate it with Visual Studio .net.

Waiting for your help.

Regards
Rohit


From: vishwajeet singh [mailto:dextrou...@gmail.com]
Sent: Friday, June 18, 2010 2:37 PM
To: Daga, Rohit
Cc: users@subversion.apache.org
Subject: Re: Installation Link


On Fri, Jun 18, 2010 at 12:58 PM, Daga, Rohit 
mailto:rohit.d...@atkearney.com>> wrote:
Hi All,

>From where I can download the Tortoise Subversion.

Request you to please share the URL.
http://tortoisesvn.net/downloads



Regards
Rohit


This message and all attachments are confidential. Any unauthorized review, 
use, disclosure, or distribution is prohibited. If you believe this message has 
been sent to you by mistake, please notify the sender by replying to this 
transmission, and delete the message and its attachments without disclosing 
them.



--
Vishwajeet Singh
+91-9657702154 | dextrou...@gmail.com | 
http://bootstraptoday.com
Twitter: http://twitter.com/vishwajeets | LinkedIn: 
http://www.linkedin.com/in/singhvishwajeet

Re: Installation Link

[Erik Andersson]

Follow the link on: http://subversion.tigris.org/ to
http://subversion.apache.org/

Cheers / Erik

On Fri, Jun 18, 2010 at 11:17 AM, Daga, Rohit wrote:

>  Hi,
>
>
>
> I have already installed 
> TortoiseSVN-1.6.8.19260-x64-svn-1.6.11.msi,
>  but
> also required Subversion to install it and use it but couldn’t able to get
> it or if I am doing something wrong request you to guide me.
>
> I am referring this link
> http://www.west-wind.com/presentations/subversion/ to install it on my
> system and integrate it with Visual Studio .net.
>
>
>
> Waiting for your help.
>
>
>
> Regards
>
> Rohit
>
>
>
>
>
> *From:* vishwajeet singh [mailto:dextrou...@gmail.com]
> *Sent:* Friday, June 18, 2010 2:37 PM
> *To:* Daga, Rohit
> *Cc:* users@subversion.apache.org
> *Subject:* Re: Installation Link
>
>
>
>
>
> On Fri, Jun 18, 2010 at 12:58 PM, Daga, Rohit 
> wrote:
>
> Hi All,
>
>
>
> From where I can download the Tortoise Subversion.
>
>
>
> Request you to please share the URL.
>
> http://tortoisesvn.net/downloads
>
>
>
>
>
>
>
> Regards
>
> Rohit
>
>
>
> This message and all attachments are confidential. Any unauthorized review,
> use, disclosure, or distribution is prohibited. If you believe this message
> has been sent to you by mistake, please notify the sender by replying to
> this transmission, and delete the message and its attachments without
> disclosing them.
>
>
>
>
> --
> Vishwajeet Singh
> +91-9657702154 | dextrou...@gmail.com | http://bootstraptoday.com
> Twitter: http://twitter.com/vishwajeets | LinkedIn:
> http://www.linkedin.com/in/singhvishwajeet
>

Re: Installation Link

[vishwajeet singh]

On Fri, Jun 18, 2010 at 2:47 PM, Daga, Rohit wrote:

>  Hi,
>
>
>
> I have already installed 
> TortoiseSVN-1.6.8.19260-x64-svn-1.6.11.msi,
>  but
> also required Subversion to install it and use it but couldn’t able to get
> it or if I am doing something wrong request you to guide me.
>
Do you need to setup Subversion server?? As you don't need Subversion to be
installed for TortoiseSVN to work.
Subversion can be downloaded from http://subversion.apache.org/


> I am referring this link
> http://www.west-wind.com/presentations/subversion/ to install it on my
> system and integrate it with Visual Studio .net.
>
>  Try to AnkhSVN for visual studio integration.

>
>
> Waiting for your help.
>
>
>
> Regards
>
> Rohit
>
>
>
>
>
> *From:* vishwajeet singh [mailto:dextrou...@gmail.com]
> *Sent:* Friday, June 18, 2010 2:37 PM
> *To:* Daga, Rohit
> *Cc:* users@subversion.apache.org
> *Subject:* Re: Installation Link
>
>
>
>
>
> On Fri, Jun 18, 2010 at 12:58 PM, Daga, Rohit 
> wrote:
>
> Hi All,
>
>
>
> From where I can download the Tortoise Subversion.
>
>
>
> Request you to please share the URL.
>
> http://tortoisesvn.net/downloads
>
>
>
>
>
>
>
> Regards
>
> Rohit
>
>
>
> This message and all attachments are confidential. Any unauthorized review,
> use, disclosure, or distribution is prohibited. If you believe this message
> has been sent to you by mistake, please notify the sender by replying to
> this transmission, and delete the message and its attachments without
> disclosing them.
>
>
>
>
> --
> Vishwajeet Singh
> +91-9657702154 | dextrou...@gmail.com | http://bootstraptoday.com
> Twitter: http://twitter.com/vishwajeets | LinkedIn:
> http://www.linkedin.com/in/singhvishwajeet
>



-- 
Vishwajeet Singh
+91-9657702154 | dextrou...@gmail.com | http://bootstraptoday.com
Twitter: http://twitter.com/vishwajeets | LinkedIn:
http://www.linkedin.com/in/singhvishwajeet

RE: Installation Link

[Daga, Rohit]

Hi,

Still not able to get thru. Request you to please send me the exact link, from 
where I can get the setup and installation guide. Right now I want my system to 
be as server and client as well and want to add my existing .net project and 
want to check in and checkout. If everything goes perfect then I will install 
it on the server and then we will connect with that server using client.

Please request you to help me in installing it on my machine.


Regards
Rohit

From: vishwajeet singh [mailto:dextrou...@gmail.com]
Sent: Friday, June 18, 2010 2:54 PM
To: Daga, Rohit
Cc: users@subversion.apache.org
Subject: Re: Installation Link


On Fri, Jun 18, 2010 at 2:47 PM, Daga, Rohit 
mailto:rohit.d...@atkearney.com>> wrote:
Hi,

I have already installed 
TortoiseSVN-1.6.8.19260-x64-svn-1.6.11.msi
 , but also required Subversion to install it and use it but couldn't able to 
get it or if I am doing something wrong request you to guide me.
Do you need to setup Subversion server?? As you don't need Subversion to be 
installed for TortoiseSVN to work.
Subversion can be downloaded from http://subversion.apache.org/

I am referring this link http://www.west-wind.com/presentations/subversion/ to 
install it on my system and integrate it with Visual Studio .net.
 Try to AnkhSVN for visual studio integration.

Waiting for your help.

Regards
Rohit


From: vishwajeet singh 
[mailto:dextrou...@gmail.com]
Sent: Friday, June 18, 2010 2:37 PM
To: Daga, Rohit
Cc: users@subversion.apache.org
Subject: Re: Installation Link


On Fri, Jun 18, 2010 at 12:58 PM, Daga, Rohit 
mailto:rohit.d...@atkearney.com>> wrote:
Hi All,

>From where I can download the Tortoise Subversion.

Request you to please share the URL.
http://tortoisesvn.net/downloads



Regards
Rohit


This message and all attachments are confidential. Any unauthorized review, 
use, disclosure, or distribution is prohibited. If you believe this message has 
been sent to you by mistake, please notify the sender by replying to this 
transmission, and delete the message and its attachments without disclosing 
them.



--
Vishwajeet Singh
+91-9657702154 | dextrou...@gmail.com | 
http://bootstraptoday.com
Twitter: http://twitter.com/vishwajeets | LinkedIn: 
http://www.linkedin.com/in/singhvishwajeet



--
Vishwajeet Singh
+91-9657702154 | dextrou...@gmail.com | 
http://bootstraptoday.com
Twitter: http://twitter.com/vishwajeets | LinkedIn: 
http://www.linkedin.com/in/singhvishwajeet

Re: Installation Link

[vishwajeet singh]

On Fri, Jun 18, 2010 at 3:12 PM, Daga, Rohit wrote:

>  Hi,
>
>
>
> Still not able to get thru. Request you to please send me the exact link,
> from where I can get the setup and installation guide. Right now I want my
> system to be as server and client as well and want to add my existing .net
> project and want to check in and checkout. If everything goes perfect then I
> will install it on the server and then we will connect with that server
> using client.
>

 If you planning to setup server, first you need to decide whether you want
to use Subversion's native server or you  want to use Apache web server to
host Subversion repositories.
 Subversion binaries for windows can be downloaded from
http://subversion.apache.org/packages.html#windows

 Based on server you are planning to use you can move ahead with further
steps.

>
>
> Please request you to help me in installing it on my machine.
>
>
>
>
>
> Regards
>
> Rohit
>
>
>
> *From:* vishwajeet singh [mailto:dextrou...@gmail.com]
> *Sent:* Friday, June 18, 2010 2:54 PM
>
> *To:* Daga, Rohit
> *Cc:* users@subversion.apache.org
> *Subject:* Re: Installation Link
>
>
>
>
>
> On Fri, Jun 18, 2010 at 2:47 PM, Daga, Rohit 
> wrote:
>
> Hi,
>
>
>
> I have already installed 
> TortoiseSVN-1.6.8.19260-x64-svn-1.6.11.msi,
>  but
> also required Subversion to install it and use it but couldn’t able to get
> it or if I am doing something wrong request you to guide me.
>
> Do you need to setup Subversion server?? As you don't need Subversion to be
> installed for TortoiseSVN to work.
>
> Subversion can be downloaded from http://subversion.apache.org/
>
>
>
>  I am referring this link
> http://www.west-wind.com/presentations/subversion/ to install it on my
> system and integrate it with Visual Studio .net.
>
>   Try to AnkhSVN for visual studio integration.
>
>
>
> Waiting for your help.
>
>
>
> Regards
>
> Rohit
>
>
>
>
>
> *From:* vishwajeet singh [mailto:dextrou...@gmail.com]
> *Sent:* Friday, June 18, 2010 2:37 PM
> *To:* Daga, Rohit
> *Cc:* users@subversion.apache.org
> *Subject:* Re: Installation Link
>
>
>
>
>
> On Fri, Jun 18, 2010 at 12:58 PM, Daga, Rohit 
> wrote:
>
> Hi All,
>
>
>
> From where I can download the Tortoise Subversion.
>
>
>
> Request you to please share the URL.
>
> http://tortoisesvn.net/downloads
>
>
>
>
>
>
>
> Regards
>
> Rohit
>
>
>
> This message and all attachments are confidential. Any unauthorized review,
> use, disclosure, or distribution is prohibited. If you believe this message
> has been sent to you by mistake, please notify the sender by replying to
> this transmission, and delete the message and its attachments without
> disclosing them.
>
>
>
>
> --
> Vishwajeet Singh
> +91-9657702154 | dextrou...@gmail.com | http://bootstraptoday.com
> Twitter: http://twitter.com/vishwajeets | LinkedIn:
> http://www.linkedin.com/in/singhvishwajeet
>
>
>
>
> --
> Vishwajeet Singh
> +91-9657702154 | dextrou...@gmail.com | http://bootstraptoday.com
> Twitter: http://twitter.com/vishwajeets | LinkedIn:
> http://www.linkedin.com/in/singhvishwajeet
>



-- 
Vishwajeet Singh
+91-9657702154 | dextrou...@gmail.com | http://bootstraptoday.com
Twitter: http://twitter.com/vishwajeets | LinkedIn:
http://www.linkedin.com/in/singhvishwajeet

SVNServe processes/threads not being closed properly - how to debug?

[Graham Reeves]

Hi All,

I currently have a problem when using JetBrain's TeamCity (see this thread;
http://www.jetbrains.net/devnet/message/5265757 ).

I'm running svnserve as a daemon on OSX leopard(1.5.6, NOT snow leopard)
with one repository root and multiple repositories. TeamCity connects to
check for changes to the repositories or checkout, it gathers the data it
needs, then just leaves the process (or thread in threaded mode) open.
JetBrains are struggling to re-create the issue, and I don't believe I have
any wierd or non-standard configuration for my server.

SvnServe is being launched with this command line
svnserve -d --listen-port 1983 -r ~/MyRepos/ --log-file=/SvnLog.txt

Tortoise SVN, xcode and svnX don't cause the same issue, so I believe
TeamCity's implementation of the protocol is to blame, but I'm struggling to
find the source of the problem. (They cannot reproduce it at their end)

The contents of the log (svnlog.txt) look fine, team city is connecting, I
see it's command... then the next one...

OSX's activity monitor gives this call stack, so I guess either the socket
isn't closed properly by team city (or svnserve/osx) or is waiting for some
kind of EOF token. (I don't know the protocol)

2266 Thread_2507
  2266 start
2266 main
  2266 serve
2266 svn_ra_svn_handle_commands2
  2266 svn_ra_svn_read_tuple
2266 svn_ra_svn_read_item
  2266 readbuf_getchar_skip_whitespace
2266 readbuf_getchar
  2266 readbuf_fill
2266 readbuf_input
  2266 svn_ra_svn__stream_read
2266 svn_stream_read
  2266 sock_read_cb
2266 read
  2266 read

Total number in stack (recursive counted multiple, when >=5):
Sort by top of stack, same collapsed (when >= 5):
read2266





And I'm currently running this version from collabnet. (I had the same issue
with 1.5.5 and the 1.4.x version bundled with osx leopard)
svn, version 1.6.6 (r40053)
compiled Oct 22 2009, 14:13:09
Copyright (C) 2000-2009 CollabNet.


Does anyone have any ideas how I can find the problem? (or what svnserve is
expecting to do next?)
My next tests (when I find some time) will be to run the repos on a windows
machine, and a last resort to compile and debug svnserve myself...


- Graham
- http://www.grahamreeves.com/

RE: Installation Link

[Bob Archer]

> Still not able to get thru. Request you to please send me the exact link,
> from where I can get the setup and installation guide. Right now I want my
> system to be as server and client as well and want to add my existing .net
> project and want to check in and checkout. If everything goes perfect then
> I will install it on the server and then we will connect with that server
> using client.
> 
> Please request you to help me in installing it on my machine.
> 
> 
> Regards
> Rohit

All this information is fairly easily available if you spend a bit of time 
looking for it and reading the docs. 

http://tinyurl.com/cvzwyl <--- first link will get you all the info you need.

Also... you should be asking question about TSVN on the TSVN user mail list. 
See link above for that too.

BOb

Re: SVNServe processes/threads not being closed properly - how to debug?

[Stefan Sperling]

On Fri, Jun 18, 2010 at 10:45:02AM +0100, Graham Reeves wrote:
> Hi All,
> 
> I currently have a problem when using JetBrain's TeamCity (see this thread;
> http://www.jetbrains.net/devnet/message/5265757 ).
> 
> I'm running svnserve as a daemon on OSX leopard(1.5.6, NOT snow leopard)

Please update to 1.6.11. We enabled TCP keep-alives in svnserve in
that release to hopefully fix forever-blocking reads from sockets.

Stefan

Re: SVNServe processes/threads not being closed properly - how to debug?

[Graham Reeves]

> > Hi All,
> >
> > I currently have a problem when using JetBrain's TeamCity (see this
> thread;
> > http://www.jetbrains.net/devnet/message/5265757 ).
> >
> > I'm running svnserve as a daemon on OSX leopard(1.5.6, NOT snow leopard)
>
> Please update to 1.6.11. We enabled TCP keep-alives in svnserve in
> that release to hopefully fix forever-blocking reads from sockets.
>
> Stefan
>

Fantastic, thanks, I'll try this ASAP.
I only downloaded that version (1.6.6) a few days ago, maybe collab.net is a
bit slow to update their package.

RE: SVNServe processes/threads not being closed properly - how to debug?

[Bob Archer]

> > Hi All,
> >
> > I currently have a problem when using JetBrain's TeamCity (see this
> thread;
> > http://www.jetbrains.net/devnet/message/5265757 ).
> >
> > I'm running svnserve as a daemon on OSX leopard(1.5.6, NOT snow leopard)
> Please update to 1.6.11. We enabled TCP keep-alives in svnserve in
> that release to hopefully fix forever-blocking reads from sockets.
> 
> Stefan
> 
> Fantastic, thanks, I'll try this ASAP.
> I only downloaded that version (1.6.6) a few days ago, maybe collab.net is
> a bit slow to update their package.

CollabNet current d/l's for OS X are 1.6.11. However for my Mac I find it 
easier to get subversion with MacPorts. The port is updated fairly quickly 
after svn revs. Much thanks to whomever maintains that.

BOb

Re: Recovering repository with multiple missing rev/ files

[Daniel Shahaf]

CC += users@

Eiren Smith wrote on Fri, 18 Jun 2010 at 10:01 -0400:
> On Jun 18, 2010, at 3:07 AM, Daniel Shahaf wrote:
> 
> > Eiren Smith wrote on Thu, 17 Jun 2010 at 23:24 -:
> > > On Jun 15, 2010, at 12:20 PM, Eiren Smith wrote:
> > > 
> > > > On Jun 15, 2010, at 12:14 PM, Stefan Sperling wrote:
> > > > 
> > > > > On Tue, Jun 15, 2010 at 11:49:44AM -0400, Eiren Smith wrote:
> > > > > > Sir:
> > > > > > 
> > > > > > Thanks for your reply. I'll read those references you cited.
> > > > > > 
> > > > > > > > 
> > > > > > > > P.S. Other files may also be missing from the revprops/ dir, not
> > > > > > > > just 7437 -- If I'm willing to lose commit messages, can I live
> > > > > > > > without some revprops/ files?
> > > > > > > 
> > > > > > > You should recreate the revprops for all revisions.
> > > > > > 
> > > > > > I have emails messages (from SubversionNotify) containing the commit
> > > > > > comments for six of seven of those revisions. If I can rebuild the
> > > > > > repository with some revprops/ files missing, I can edit the
> > > > > > comments later. Will this work?
> > > > > 
> > > > > Sure, that will work. You'll need to do a manual commit of the changes
> > > > > made in lost revisions, and then tweak the revision properties after
> > > > > the
> > > > > commit is done. See also the 'svnadmin setrevprop' command, which will
> > > > > help you to set the revision properties (svn:date, svn:author, and
> > > > > svn:log).
> > > > > 
> > > > > Stefan
> > > > 
> > > > Thank you.
> > > > 
> > > > I won't be able to accurately mimic the seven missing changes as most of
> > > > them were for binary files (project documentation and some DLLs).
> > > > 
> > > > Instead, is there a way to simply say "All future revisions that depend
> > > > upon these seven revisions are dead/null" so I can piece the repo back
> > > > together with just that minor loss?
> > > > 
> > > > Thanks,
> > > > 
> > > > /eiren
> > > 
> > > 
> > > Anyone:
> > > 
> > > Any ideas about how to handle this since I can't mimic the changes to the
> > > binary files modified in the missing revs?
> > > 
> > 
> > Patch svnadmin to skip those particular files (hard-code them) when
> > parsing a dumpfile?
> > 
> 
> Sorry, I don't understand. Could you expand on that?
> 

IIRC, you were suggested to dump the repository (in parts) in order to
recover it.  Normally, if you just load these dumpfiles, it will error
at some point due to the missing revisions (which weren't dumped).  So
I suggested to recompile svnadmin with a one-off patch that changes the
'svnadmin load' logic to ignore anything in the dumpfiles that touches
one of the files touched in those seven revisions.

Essentially, look up what paths were touched in those seven revisions,
and then patch load.c so that, when it parses from the dumpfile an entry
concerning one of those files, the entry gets ignored (dropped on the
floor) and will not be forwarded to the FS layer as normal (with the aim
of making a commit to the repository-being-loaded-into).

Clearer?

> /eiren
> 
> > > Sorry if nudging this is bad form for this list.
> > > 
> > > /eiren
> > > 

Merge conflict markers... indicate what?

[Bob Archer]

Hi All,

I am doing our weekly merge from our release version project path to our new 
version development path. I am a bit confused at what the conflict markers are 
showing me... here is the snippet of the code with the conflict markers:

<<< .working
If loBudgetCheck.OBMsg Is Nothing Then
Exit For
End If
===
If Not loBudgetCheck.OBMsg Is Nothing Then
>>> .merge-right.r40712

What does this mean?  I expected to see the change made in the target as 
working and the change made in the source as "right".

BOb

Re: Merge conflict markers... indicate what?

[Olivier Sannier]

Bob Archer wrote:


Hi All,

 

I am doing our weekly merge from our release version project path to 
our new version development path. I am a bit confused at what the 
conflict markers are showing me... here is the snippet of the code 
with the conflict markers:


 


<<< .working

If loBudgetCheck.OBMsg Is Nothing Then

Exit For

End If

===

If Not loBudgetCheck.OBMsg Is Nothing Then

>>> .merge-right.r40712

 

What does this mean?  I expected to see the change made in the target 
as working and the change made in the source as "right".


 


BOb

Working is what was on your hardrive (in your working copy) before you 
updated.

Merge right is what comes from the server, namely at revision 40712
You have to decide what version of the two you want to keep.

--
Olivier Sannier
oliv...@obones.com
http://www.obones.com/

Retrouvez-moi sur Viadeo :
http://www.viadeo.com/invitationpersonnelle/0023asu3wwgwpzx

RE: Merge conflict markers... indicate what?

[Bob Archer]

> Bob Archer wrote:
> >
> > Hi All,
> >
> >
> >
> > I am doing our weekly merge from our release version project path
> to
> > our new version development path. I am a bit confused at what the
> > conflict markers are showing me... here is the snippet of the
> code
> > with the conflict markers:
> >
> >
> >
> > <<< .working
> >
> > If loBudgetCheck.OBMsg Is Nothing
> Then
> >
> > Exit For
> >
> > End If
> >
> > ===
> >
> > If Not loBudgetCheck.OBMsg Is
> Nothing Then
> >
> > >>> .merge-right.r40712
> >
> >
> >
> > What does this mean?  I expected to see the change made in the
> target
> > as working and the change made in the source as "right".
> >
> >
> >
> > BOb
> >
> Working is what was on your hardrive (in your working copy) before
> you
> updated.
> Merge right is what comes from the server, namely at revision 40712
> You have to decide what version of the two you want to keep.
> 

So basically what is between the <<< and the  is the diff between 
the base common rev and the working copy. And what is between the = and 
the >> is the diff between the base common rev and the change in 
r40712? Is that correct? And if so... how does svn determine the common base 
rev?

BOb

Re: Merge conflict markers... indicate what?

[Olivier Sannier]

Bob Archer wrote:

Bob Archer wrote:


Hi All,



I am doing our weekly merge from our release version project path
  

to


our new version development path. I am a bit confused at what the
conflict markers are showing me... here is the snippet of the
  

code


with the conflict markers:



<<< .working

If loBudgetCheck.OBMsg Is Nothing
  

Then


Exit For

End If

===

If Not loBudgetCheck.OBMsg Is
  

Nothing Then


.merge-right.r40712



What does this mean?  I expected to see the change made in the
  

target


as working and the change made in the source as "right".



BOb

  

Working is what was on your hardrive (in your working copy) before
you
updated.
Merge right is what comes from the server, namely at revision 40712
You have to decide what version of the two you want to keep.




So basically what is between the <<< and the  is the diff between the base common rev and the working copy. And what is between the = and the >> is the diff between the base common rev and the change in r40712? Is that correct? 

Yes


And if so... how does svn determine the common base rev?
It's written in the .svn folder that keeps track of the latest revision 
content, among other things.

Re: Recovering repository with multiple missing rev/ files

[Eiren Smith]

On Jun 18, 2010, at 2:53 PM, Daniel Shahaf wrote:


CC += users@

Eiren Smith wrote on Fri, 18 Jun 2010 at 10:01 -0400:

On Jun 18, 2010, at 3:07 AM, Daniel Shahaf wrote:


Eiren Smith wrote on Thu, 17 Jun 2010 at 23:24 -:

On Jun 15, 2010, at 12:20 PM, Eiren Smith wrote:


On Jun 15, 2010, at 12:14 PM, Stefan Sperling wrote:


On Tue, Jun 15, 2010 at 11:49:44AM -0400, Eiren Smith wrote:

Sir:

Thanks for your reply. I'll read those references you cited.



P.S. Other files may also be missing from the revprops/ dir,  
not
just 7437 -- If I'm willing to lose commit messages, can I  
live

without some revprops/ files?


You should recreate the revprops for all revisions.


I have emails messages (from SubversionNotify) containing the  
commit
comments for six of seven of those revisions. If I can rebuild  
the

repository with some revprops/ files missing, I can edit the
comments later. Will this work?


Sure, that will work. You'll need to do a manual commit of the  
changes
made in lost revisions, and then tweak the revision properties  
after

the
commit is done. See also the 'svnadmin setrevprop' command,  
which will
help you to set the revision properties (svn:date, svn:author,  
and

svn:log).

Stefan


Thank you.

I won't be able to accurately mimic the seven missing changes as  
most of

them were for binary files (project documentation and some DLLs).

Instead, is there a way to simply say "All future revisions that  
depend
upon these seven revisions are dead/null" so I can piece the  
repo back

together with just that minor loss?

Thanks,

/eiren



Anyone:

Any ideas about how to handle this since I can't mimic the  
changes to the

binary files modified in the missing revs?



Patch svnadmin to skip those particular files (hard-code them) when
parsing a dumpfile?



Sorry, I don't understand. Could you expand on that?



IIRC, you were suggested to dump the repository (in parts) in order to
recover it.  Normally, if you just load these dumpfiles, it will error
at some point due to the missing revisions (which weren't dumped).  So
I suggested to recompile svnadmin with a one-off patch that changes  
the

'svnadmin load' logic to ignore anything in the dumpfiles that touches
one of the files touched in those seven revisions.

Essentially, look up what paths were touched in those seven revisions,
and then patch load.c so that, when it parses from the dumpfile an  
entry

concerning one of those files, the entry gets ignored (dropped on the
floor) and will not be forwarded to the FS layer as normal (with the  
aim

of making a commit to the repository-being-loaded-into).

Clearer?


/eiren


Sorry if nudging this is bad form for this list.

/eiren



Clear. Thanks, Daniel.

If I wind up going that route, I'll do also check revision numbers so  
I only start ignoring those files at the point where I'm missing  
revision files that include modifications to them, leaving previous  
revision history for them intact.


I might also do some fake revisions (to some unrelated dummy files, I  
suppose) to keep my revision numbers from shifting.


/eiren

Calling svn.exe from C++ code!

[fantasy1215]

For some reason, I need to call svn.exe in my code, following is just a test
hard written code,
What am I doing is just 'svn diff'.
but it doesn't work. Not touch a c:\abc123.txt file.
Thanks in advance!
TCHAR szExePath[] = TEXT("C:\\Program Files\\Subversion\\bin\\svn.exe");
SHELLEXECUTEINFO shinfo = {0};
shinfo.cbSize = sizeof(SHELLEXECUTEINFO);
shinfo.fMask = SEE_MASK_NO_CONSOLE;
shinfo.hwnd = NULL;
shinfo.lpVerb = TEXT("open");
shinfo.lpFile = szExePath;
shinfo.lpParameters = TEXT(" diff -r 755:HEAD E:\\workcopy\\Main.cpp >
c:\\abc123.txt");
shinfo.lpDirectory = NULL;
shinfo.nShow = SW_SHOW;
shinfo.hInstApp = NULL;
BOOL bRet = FALSE;
bRet = ::ShellExecuteEx(&shinfo);->here return value is 
TRUE,
and I saw console flash
-- 
View this message in context: 
http://old.nabble.com/Calling-svn.exe-from-C%2B%2B-code%21-tp28932381p28932381.html
Sent from the Subversion Users mailing list archive at Nabble.com.

Re: Recovering repository with multiple missing rev/ files

[Daniel Shahaf]

Eiren Smith wrote on Fri, 18 Jun 2010 at 23:50 -:
> On Jun 18, 2010, at 2:53 PM, Daniel Shahaf wrote:
> > Eiren Smith wrote on Fri, 18 Jun 2010 at 10:01 -0400:
> > > On Jun 18, 2010, at 3:07 AM, Daniel Shahaf wrote:
> > > > Eiren Smith wrote on Thu, 17 Jun 2010 at 23:24 -:
> > > > > Any ideas about how to handle this since I can't mimic the changes to
> > > > > the
> > > > > binary files modified in the missing revs?
> > > > > 
> > > > 
> > > > Patch svnadmin to skip those particular files (hard-code them) when
> > > > parsing a dumpfile?
> > > > 
> > > 
> > > Sorry, I don't understand. Could you expand on that?
> > > 
> > 
> > IIRC, you were suggested to dump the repository (in parts) in order to
> > recover it.  Normally, if you just load these dumpfiles, it will error
> > at some point due to the missing revisions (which weren't dumped).  So
> > I suggested to recompile svnadmin with a one-off patch that changes the
> > 'svnadmin load' logic to ignore anything in the dumpfiles that touches
> > one of the files touched in those seven revisions.
> > 
> > Essentially, look up what paths were touched in those seven revisions,
> > and then patch load.c so that, when it parses from the dumpfile an entry
> > concerning one of those files, the entry gets ignored (dropped on the
> > floor) and will not be forwarded to the FS layer as normal (with the aim
> > of making a commit to the repository-being-loaded-into).
> > 
> > Clearer?
> 
> Clear. Thanks, Daniel.
> 
> If I wind up going that route, I'll do also check revision numbers so I only
> start ignoring those files at the point where I'm missing revision files that
> include modifications to them, leaving previous revision history for them
> intact.
> 
> I might also do some fake revisions (to some unrelated dummy files, I suppose)
> to keep my revision numbers from shifting.
> 

I'd just do a propset on those same files...

Daniel
(btw, if you need help getting that patch done, feel free to ask)

> /eiren