On Jun 25, 2012, at 23:25 , s...@apache.org wrote:
Author: stsp
Date: Mon Jun 25 21:25:47 2012
New Revision: 1353748
URL: http://svn.apache.org/viewvc?rev=1353748view=rev
Log:
Following up to r1353730, fix a test failure due to passing the wrong number
of arguments to a helper function.
-conflicts.txt for more details.
Steve
--
Stephen Butler
elego Software Solutions GmbH
http://www.elego.de
On May 7, 2012, at 1:26 , Stefan Sperling wrote:
On Sun, May 06, 2012 at 10:34:53PM +0200, Stephen Butler wrote:
OK, I'll volunteer. ATM I'm still learning what release.py does, but I'll
try
to get up to speed this week.
Steve
Thanks! But Philip already volunteered to run 1.7.5. You
On May 5, 2012, at 12:48 , Stefan Sperling wrote:
On Wed, Apr 25, 2012 at 11:50:16AM +0200, Stefan Sperling wrote:
On Wed, Apr 25, 2012 at 11:49:53AM +0300, Daniel Shahaf wrote:
I don't know when we're cutting 1.7.5, but I'm stepping down from the RM
hot seat. (I can no longer commit to
On Mar 17, 2012, at 1:14 , Johan Corveleyn wrote:
On Fri, Mar 16, 2012 at 10:40 PM, Branko Čibej br...@apache.org wrote:
On 16.03.2012 15:50, Stephen Butler wrote:
Some users do want more control over update (i.e., they trust
Subversion less). Interactive resolution during or after update
On Mar 17, 2012, at 13:43 , Branko Čibej wrote:
On 17.03.2012 11:25, Stephen Butler wrote:
Somewhat off-topic, but svn update has the serious problem that it's
impossible to revert to the state before the update if one had local
changes. Most of these pick sane defaults kinds of discussions
On Mar 16, 2012, at 15:31 , Greg Stein wrote:
I'm trimming hard on this reply because you've identified a core/key
principle that we differ on. And from there, everything else falls out from
there.
On Mar 16, 2012 10:03 AM, Stefan Sperling s...@elego.de wrote:
...
I could just as
data
Maybe it can
be recovered from the failing buildbot?
--
Johan
--
Stephen Butler | Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25, 13355 Berlin, Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elego.de
Geschäftsführer: Olaf
On Feb 2, 2012, at 23:18 , Johan Corveleyn wrote:
On Thu, Feb 2, 2012 at 5:13 PM, danie...@apache.org wrote:
Author: danielsh
Date: Thu Feb 2 16:13:20 2012
New Revision: 1239695
URL: http://svn.apache.org/viewvc?rev=1239695view=rev
Log:
Merge the r1207555 group from trunk:
*
On Jan 25, 2012, at 1:47 , Johan Corveleyn wrote:
Just to confirm this point: I've been able to reproduce #4023 (or a
variation thereof) with TortoiseSVN 1.6:
- Add 'foo' as a versioned file. Commit.
- Delete 'foo' from filesystem (non-svn delete).
- Create new file 'FOO'.
-
-import support, as discussed on this list recently.
http://svn.haxx.se/dev/archive-2011-11/0328.shtml
Regards,
Steve
--
Stephen Butler | Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25, 13355 Berlin, Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345
,
svn_repos_parse_dumpstream2): Backward compatibility boilerplate.
]]]
svndump-v3-1.diff
Description: Binary data
--
Stephen Butler | Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25, 13355 Berlin, Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elego.de
On Dec 20, 2011, at 12:51 , Eric S. Raymond wrote:
Still working on it as I await restoration of commit access. Here's the
0.4 version. Note the two open questions and the buglet.
[[[
1. Is it true that a replace operation on a directory *must*
have a copyfrom source?
]]]
No. A replace
,
Steve
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht
.
i.e., you could run 'svn cp' several times in a working copy, and then
commit once with 'svn ci'.
Steve
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http
to AdminGroup.
We need a couple of volunteers to join AdminGroup now.
Count me in!
Thanks,
Steve
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http
On Oct 4, 2011, at 9:44 , Daniel Shahaf wrote:
Stephen Butler wrote on Tue, Oct 04, 2011 at 09:40:09 +0200:
On Oct 4, 2011, at 9:17 , Daniel Shahaf wrote:
We need a couple of volunteers to join AdminGroup now.
Count me in!
Thanks for volunteering, what's your wiki username
On Oct 4, 2011, at 11:07 , Daniel Shahaf wrote:
Stephen Butler wrote on Tue, Oct 04, 2011 at 10:44:49 +0200:
On Oct 4, 2011, at 9:44 , Daniel Shahaf wrote:
Stephen Butler wrote on Tue, Oct 04, 2011 at 09:40:09 +0200:
On Oct 4, 2011, at 9:17 , Daniel Shahaf wrote:
We need a couple
On Aug 31, 2011, at 23:47 , Stefan Sperling wrote:
On Wed, Aug 31, 2011 at 10:35:00PM +0200, Stephen Butler wrote:
Hi folks,
Is anyone else seeing the following test failures on trunk?
At least one test FAILED, checking
/Users/steve/dev/unix-build/svn-trunk/tests.log
FAIL
to have a rule that we can explain in a single sentence:
Copying conflicted items implies 'svn resolve --depth infinite --accept
mine-full' at the destination path.
Steve
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49
already excised that line in r1132693, along with reducing
the DB transactions needed..
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http
changes (now XFAIL).
I'll try again with a quick hack in the spirit of r1061328.
Steve
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
On Jun 7, 2011, at 2:22 , Stephen Butler wrote:
On Jun 7, 2011, at 2:02 , Bert Huijben wrote:
[...]
Author: sbutler
Date: Mon Jun 6 23:27:06 2011
New Revision: 1132834
URL: http://svn.apache.org/viewvc?rev=1132834view=rev
Log:
Fix the move command for issue 3899 (auto resolve
(status=' ', copied='+', wc_rev='-'),
})
svntest.actions.run_and_verify_status(wc('copy-dest'), expected_status)
]]]
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30
by implementing the automatic conflict resolution on copy
destinations. Then we can tackle the move-destinations.
Steve
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695
no tree conflict at Z.
Steve
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft
copying or
moving the directory's children.
Comments?
I have a simple solution for #1 above, and the beginning of a test.
I'll commit them if I get a +1.
Regards,
Steve
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49
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 (including marker
,
replace_and_propset_locked_path,
cp_isnt_ro,
+ update_locked_deleted,
]
if __name__ == '__main__':
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49 30 2345 8696 | mobile: +49
on case (in)sensitive system
dhcp207:libsvn_wc Hyrum$
]]]
I've no insight into what this failure is being caused by, but Daniel
reports it passes on his Linux box.
It fails on my Mac OS box, too.
Steve
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht
' actually does and I am not sure how
it was originally designed to work.
- Julian
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
your changes into the scripts. It is handy because I don't
have a Windows machine for testing. Please go ahead and continue
sending your patches to the list!
(or if you'd like, we can offer you direct commit access to the
suite1/ directory)
Cheers,
-g
--
Stephen Butler | Senior
`/home/vignesh/src/svn/subversion/svn-trunk'
make: ***
[/home/vignesh/src/svn/subversion/objdir/svn-trunk/.bindings-compiled]
Error
2
Hi Vignesh,
you need to install swig.
thanks
-vignesh
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25
] syntax.
]]]
HTH,
Steve
Thanks,
Dongsheng
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz
malformed_element_error(send-deltas,
resource-pool);
+}
+ send_deltas = parsed_val ? TRUE : FALSE;
}
}
}
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30
longstanding hacks in libsvn_client/repos_diff.c.
If that makes any sense
Steve
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
On Aug 16, 2010, at 12:11 , Julian Foad wrote:
Stephen Butler wrote:
On Aug 16, 2010, at 10:40 , Julian Foad wrote:
I would suggest that the output of svn diff --summarize should be
consistent with the likes of svn add (no 'M'), svn status (no 'M')
and svn update (I haven't checked this one
XFail from diff_renamed_dir.
]]]
--
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB
Sending again with a non-null attachment MIME-type...
Steve
Quoting Stephen Butler sbut...@elego.de:
Hi folks,
here's a work in progress for fixing a long-standing diff bug.
'svn diff URL1 URL2' not reverse of 'svn diff URL2 URL1'
http://subversion.tigris.org/issues/show_bug.cgi?id=2333
barfoo, mentally :-) .)
Stephen Butler, I saw your later followup, but were you clear on how
limited Mark's proposal actually is?
-Karl
Ooops, I see I misunderstood the proposal. Thanks, Karl.
So, Mark, go ahead and open the issue. It'd be nice to reproduce it
using the latest Subversion
or sysadmin
automation (e.g., cfengine).
Regards,
Steve
--
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf
/working_copies/update_tests-57/A/B/E/alpha':
No such file or directory
--
Philip
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
...
--
anatoly t.
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
45 matches
Mail list logo
