On Thu, May 26, 2011 at 6:32 PM, Mark Phippard wrote:
> On Thu, May 26, 2011 at 11:13 AM, Mark Phippard wrote:
>> I applied your patch on OSX and figured I would at least run the tests
>> for you. Builds go OK, but the one of the tests fail and two other
>> tests crash your patch applied. The c
[[[
Simpler/faster LCS algorithm in libsvn_diff by elimination of idx.
* subversion/libsvn_diff/lcs.c
(svn_diff__snake_t): Removed idx parameter (always 0)
(svn_diff__lcs_t): Removed idx variable (always 0) , let d have either
sign, and moved the origo of fp by d. New version no longer choo
> -Original Message-
> From: rhuij...@apache.org [mailto:rhuij...@apache.org]
> Sent: donderdag 26 mei 2011 17:39
> To: comm...@subversion.apache.org
> Subject: svn commit: r1127965 - in /subversion/branches/1.6.x-r966167: ./
> build/generator/ subversion/include/private/ subversion/libsvn_
On Thu, May 26, 2011 at 11:13 AM, Mark Phippard wrote:
> I applied your patch on OSX and figured I would at least run the tests
> for you. Builds go OK, but the one of the tests fail and two other
> tests crash your patch applied. The crashes look the same in both
> cases.
>
> Note, I have not r
Having cleared up the confusion over what info becomes invalid, the
overall answer seems clear to me:
A tree conflict applies to a path.
Think first of the simpler case: a file. If I copy the (local, working)
file to another name or to another directory, the tree conflict (info)
should not be co
Philip Martin wrote:
> Julian Foad writes:
>
> > I am not saying there are no problems with such copies/moves, just I
> > don't see a problem with the conflict-source info.
>
> Issue 3899 is not about repository locations but about the
> left/right/mine files in ACTUAL_NODE.
>
> Suppose file "A
Julian Foad writes:
> I am not saying there are no problems with such copies/moves, just I
> don't see a problem with the conflict-source info.
Issue 3899 is not about repository locations but about the
left/right/mine files in ACTUAL_NODE.
Suppose file "A/f" is in conflict:
$ sqlite3 wc/.svn/
On Thu, 2011-05-26 at 17:18 +0200, Stephen Butler wrote:
> On May 26, 2011, at 16:32 , Julian Foad wrote:
>
> > On Thu, 2011-05-26 at 13:42 +0200, Stephen Butler wrote:
> >> I've assigned issue 3899 "forbid wc-wc copy/move of conflict victims"
> >> to myself, but I think it needs a little more dis
On May 26, 2011, at 16:32 , Julian Foad wrote:
> On Thu, 2011-05-26 at 13:42 +0200, Stephen Butler wrote:
>> I've assigned issue 3899 "forbid wc-wc copy/move of conflict victims"
>> to myself, but I think it needs a little more discussion.
>>
>> The basic idea is that the conflict data (includin
Hi,
I applied your patch on OSX and figured I would at least run the tests
for you. Builds go OK, but the one of the tests fail and two other
tests crash your patch applied. The crashes look the same in both
cases.
Note, I have not run tests recently on this box, so I am not 100%
certain the te
Do not know if it is related but I just updated and am running the
tests on my Mac. I have not run the tests in a while. I got a crash
during the tests. I think it was the externals tests but everything is
reporting success so far.
Here is the info that came up from the crash:
Application Speci
On Thu, 2011-05-26 at 09:32 -0400, Greg Stein wrote:
> On May 26, 2011 9:30 AM, "Greg Stein" wrote:
> >
> >
> > On May 26, 2011 9:08 AM, wrote:
> > >...
> >
> > > #include "../../libsvn_wc/wc.h"
> > > #include "../../libsvn_wc/wc-queries.h"
> > > #include "../../libsvn_wc/wc_db.h"
> > > +#defi
On Thu, 2011-05-26 at 13:42 +0200, Stephen Butler wrote:
> I've assigned issue 3899 "forbid wc-wc copy/move of conflict victims"
> to myself, but I think it needs a little more discussion.
>
> The basic idea is that the conflict data (including marker files) includes
> references to "their" versio
On Thu, 2011-05-26 at 09:50 -0400, Greg Stein wrote:
> On May 26, 2011 9:39 AM, wrote:
> >
> > Author: julianfoad
> > Date: Thu May 26 13:38:37 2011
> > New Revision: 1127904
> >
> > URL: http://svn.apache.org/viewvc?rev=1127904&view=rev
> > Log:
> > * subversion/libsvn_wc/wc_db.c
> > (insert_ext
On May 26, 2011 9:39 AM, wrote:
>
> Author: julianfoad
> Date: Thu May 26 13:38:37 2011
> New Revision: 1127904
>
> URL: http://svn.apache.org/viewvc?rev=1127904&view=rev
> Log:
> * subversion/libsvn_wc/wc_db.c
> (insert_external_node): Move a local variable inside the conditional
block
>that
On May 26, 2011 9:30 AM, "Greg Stein" wrote:
>
>
> On May 26, 2011 9:08 AM, wrote:
> >...
>
> > #include "../../libsvn_wc/wc.h"
> > #include "../../libsvn_wc/wc-queries.h"
> > #include "../../libsvn_wc/wc_db.h"
> > +#define SVN_WC__I_AM_WC_DB
> > +#include "../../libsvn_wc/wc_db_private.h"
>
>
On May 26, 2011 9:08 AM, wrote:
>...
> #include "../../libsvn_wc/wc.h"
> #include "../../libsvn_wc/wc-queries.h"
> #include "../../libsvn_wc/wc_db.h"
> +#define SVN_WC__I_AM_WC_DB
> +#include "../../libsvn_wc/wc_db_private.h"
No you're not :-)
Why is that present?
Cheers,
-g
On May 26, 2011 9:13 AM, "Philip Martin" wrote:
>
> Greg Stein writes:
>
> > On May 26, 2011 6:58 AM, wrote:
> >>
> >> @@ -6078,6 +6078,28 @@ op_delete_txn(void *baton,
> >> || status == svn_wc__db_status_not_present)
> >> return SVN_NO_ERROR;
> >>
> >> + like_arg = construct_like_arg
On Thu, May 26, 2011 at 02:27:02PM +0200, Markus Schaber wrote:
> When I have a local added (moved, copied) directory which tree conflicts
> on update with a remotely added directory, then I want to be able to
> resolve the conflict by moving/renaming my local variant out of the way,
> to allow the
Greg Stein writes:
> On May 26, 2011 6:58 AM, wrote:
>>
>> @@ -6078,6 +6078,28 @@ op_delete_txn(void *baton,
>> || status == svn_wc__db_status_not_present)
>> return SVN_NO_ERROR;
>>
>> + like_arg = construct_like_arg(local_relpath, scratch_pool);
>> +
>> + SVN_ERR(svn_sqlite__get_st
On May 26, 2011 6:58 AM, wrote:
>
> @@ -6078,6 +6078,28 @@ op_delete_txn(void *baton,
> || status == svn_wc__db_status_not_present)
> return SVN_NO_ERROR;
>
> + like_arg = construct_like_arg(local_relpath, scratch_pool);
> +
> + SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
> +
On May 26, 2011 8:38 AM, wrote:
>...
> @@ -416,6 +409,13 @@ check_db_rows(svn_test__sandbox_t *b,
> svn_sqlite__db_t *sdb;
> int i;
> svn_sqlite__stmt_t *stmt;
> + const char *const statements[] = {
> +"SELECT op_depth, presence, local_relpath, revision, repos_path "
> + "FROM node
Hi, Steven,
> Von: Stephen Butler [mailto:sbut...@elego.de]
>
> I've assigned issue 3899 "forbid wc-wc copy/move of conflict victims"
> to myself, but I think it needs a little more discussion.
>
> The basic idea is that the conflict data (including marker files)
includes
> references to "their"
> -Original Message-
> From: Stefan Sperling [mailto:s...@elego.de]
> Sent: donderdag 26 mei 2011 13:33
> To: dev@subversion.apache.org
> Subject: Re: svn commit: r1127862 -
> /subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
>
> On Thu, May 26, 2011 at 10:53:20AM -, r
I've assigned issue 3899 "forbid wc-wc copy/move of conflict victims"
to myself, but I think it needs a little more discussion.
The basic idea is that the conflict data (including marker files) includes
references to "their" version from the repository, which would be invalid
anywhere else in the
On Thu, May 26, 2011 at 10:53:20AM -, rhuij...@apache.org wrote:
> Author: rhuijben
> Date: Thu May 26 10:53:20 2011
> New Revision: 1127862
>
> URL: http://svn.apache.org/viewvc?rev=1127862&view=rev
> Log:
> * subversion/tests/libsvn_subr/dirent_uri-test.c
> (test_funcs): Remove WIMP from t
On Wed, 2011-05-25 at 06:06 -0400, Greg Stein wrote:
> On May 25, 2011 5:50 AM, "Stefan Sperling" wrote:
> > On Wed, May 25, 2011 at 10:12:42AM +0100, Julian Foad wrote:
> > > We can catch some WC DB inconsistencies as soon as they happen by adding
> > > SQLite "trigger" functions that fire on add
27 matches
Mail list logo
