RE: Commit failed because I couldn't connect.

2011-12-14 Thread Mertens, Bram
>


Mazda Motor Logistics Europe NV, Blaasveldstraat 162, B-2830 Willebroek
VAT BE 0406.024.281, RPR Mechelen, ING  310-0092504-52, IBAN : BE64 3100 0925 
0452, SWIFT : BBRUBEBB

-Original Message-
> From: ben...@cs.its.ac.id [mailto:ben...@cs.its.ac.id]
> Sent: woensdag 14 december 2011 9:35
> To: users@subversion.apache.org
> Subject: Commit failed because I couldn't connect.
>
> Hi, I'm a new member in the maillist. Nice to meet all of you. Now, for my
> question. This is my current system:
>
> The SVN-client: windows xp pro + Tortoise SVN 1.6.16, Build 21511
> The SVN-server: windows xp pro + WANDisco uberSVN 11.10 beta + SVN
> 1.6.17
> + XAMPP 1.7.4
>
> The SVN worked for a few weeks, but today it doesn't. This is the message
> from tortoise:
>
> Commit failed (details follow):
> OPTIONS of 'http://192.168.1.116:9880/NSsFS-2D-RBU/trunk': could not
> connect to
> server (http://192.168.1.116:9880)
>
>
> I've tried to browse the link from a browser and it also didn't work. So I
> guess the problem is at the apache server or so. My assumption is the
> apache from uberSVN and XAMPP clashed. How do I solve this? Thanks a lot
> in advance.

Welcome to the list.

Don't take this wrong, it is meant to help you, but please read 
http://catb.org/~esr/faqs/smart-questions.html .

Basically you are asking someone else to do your job by saying "it doesn't 
work" and expecting someone else to take your hand and walk you through it.

A lot of people on this list are very helpful but you need to show you at least 
tried to solve it and ask specific questions.

For example: how did you come to the assumption that uberSVN and XAMPP clash?  
If it worked for a few weeks, the config seems to at least work.  What changed?

What happened?  What do the log files say?
Have you tried to telnet to port 9880 on 192.168.1.116?
Can you connect to the SVN repo on that server locally (that "sweet 127.0.0.1" 
in your signature)?

In basic troubleshooting you start with as few components as possible: just 
SVN, no remote connection, no tortoise, no web server.
Then you test by adding one component at a time.
And check the log files.

Regards

Bram


RE: how to compare an exported file (or set of files) against the repository?

2011-10-05 Thread Mertens, Bram


>


Mazda Motor Logistics Europe NV, Blaasveldstraat 162, B-2830 Willebroek
VAT BE 0406.024.281, RPR Mechelen, ING  310-0092504-52, IBAN : BE64 3100 0925 
0452, SWIFT : BBRUBEBB

-Original Message-
> From: Ulrich Eckhardt [mailto:ulrich.eckha...@dominolaser.com]
> Sent: woensdag 5 oktober 2011 15:38
> To: users@subversion.apache.org
> Subject: Re: how to compare an exported file (or set of files) against the
> repository?
>
> Am 05.10.2011 14:49, schrieb Mertens, Bram:
> > I have been unable to find an answer to this in the FAQ or the
> > mailing list archives. I found one question that appears to be
> > similar to what  I'm trying to achieve but it did not contain a
>  > reply that solves my problem.
>
> I haven't found the need for that yet, even though I'm prepared (see
> below) for the situation.
>
> > I've got a set of files that were exported from a repository some
> > time ago. The files have been moved around and some have been
> > edited since.
> >
> > I would like to find out:
> > a) what revision these files are from and
>
> There are so-called keywords, which SVN can be made to replace in text
> files. You can for example tell it to fill in the URL and revision a
> file is checked out from. This can be used to attach some metadata to an
> exported source tree. Of course that doesn't help you know, unless
> someone already prepared for this case. Note that the revision of a file
> doesn't change if you change a different file, so it can't give you
> _The_ revision of the source tree. OTOH, there is no guarantee that you
> don't have an export from a mixed-revision working copy.

Thx for this, but I am aware of this feature and should have mentioned that it 
is currently not being used (though I'll be changing that).

> > b) changes have been made to it that may not be in the repository?
>
> Find out where this was exported from, and check out that revision. Copy
> the export on top of it and compare, or use a recursive tree comparison
> utility.
>
>
> > Is this possible without looping through all the revisions and
> > calculating checksums? The problem with appraoch besides the time it
> > would take is that it  would obviously not catch files that are not
>  > 100% identical to the files in that revision.
>
> If the source tree contains files from several different revisions, that
> will be the only (hard) way to go. However, I guess you can expect that
> the export was made from one revision. If you know the history of the
> according project a bit, you might be able to find the approximate
> revision it was checked out and from there search for the exact
> revision. Another hint might be hidden in modification timestamps.
>
> BTW: The most efficient way is to check out an approximate revision and
> then use "svn up -r ..." to move to the next revision quickly. In
> particular you shouldn't use export instead of an incremental update.

Too bad there is no less complicated way of doing this but I guess I'll use a 
combination of the suggestions in this thread to accomplish what I need.

If anyone has a better suggestion I'd like to hear about it still.

Regards and thanks for all the feedback received so far.

Bram


how to compare an exported file (or set of files) against the repository?

2011-10-05 Thread Mertens, Bram
Hi,

I have been unable to find an answer to this in the FAQ or the mailing list 
archives.  I found one question that appears to be similar to what I'm trying 
to achieve but it did not contain a reply that solves my problem.

I've got a set of files that were exported from a repository some time ago.  
The files have been moved around and some have been edited since.

I would like to find out: a) what revision these files are from and b) what 
changes have been made to it that may not be in the repository?

Is this possible without looping through all the revisions and calculating 
checksums?
The problem with appraoch besides the time it would take is that it would 
obviously not catch files that are not 100% identical to the files in that 
revision.

Thanks in advance for any pointer that would help in this.

Bram



Mazda Motor Logistics Europe NV, Blaasveldstraat 162, B-2830 Willebroek
VAT BE 0406.024.281, RPR Mechelen, ING  310-0092504-52, IBAN : BE64 3100 0925 
0452, SWIFT : BBRUBEBB