Re: Feature request: Save the old file when svn revert

2015-07-23 Thread Daniel Becroft
On Thu, Jul 23, 2015 at 7:16 PM Grierson, David wrote: > > -Original Message- > > From: Branko Čibej [mailto:br...@wandisco.com] > > Sent: 23 July 2015 07:59 > > To: us...@subversion.apache.org > > Subject: Re: Feature request: Save the old file when svn revert > > > > On 22.07.2015 15:51

Re: WC-NG, externals and fast properties

2011-05-11 Thread Daniel Becroft
On Thu, May 12, 2011 at 12:12 AM, Bert Huijben wrote: > > > > -Original Message- > > From: Hans-Emil Skogh [mailto:hans-emil.sk...@tritech.se] > > Sent: woensdag 11 mei 2011 15:48 > > To: dev@subversion.apache.org > > Subject: RE: WC-NG, externals and fast properties > > > > Thanks for yo

Re: 'svn switch' now requires --ignore-ancestry?

2011-04-23 Thread Daniel Becroft
On Sat, Apr 23, 2011 at 2:13 PM, C. Michael Pilato wrote: > On 04/22/2011 11:40 PM, Daniel Becroft wrote: > > But then you're > > asking to switch a working copy which reflects trunk's *parent > directory* to > > trunk's URL. > > > >

Re: 'svn switch' now requires --ignore-ancestry?

2011-04-22 Thread Daniel Becroft
On Sat, Apr 23, 2011 at 1:02 PM, C. Michael Pilato wrote: > On 04/22/2011 05:15 PM, Daniel Becroft wrote: > > Hi, > > > > I've just updated to trunk@1096029, and have noticed the following > change in > > behavior. > > > > Previously, any reprod

'svn switch' now requires --ignore-ancestry?

2011-04-22 Thread Daniel Becroft
fine. I don't think this is required, though, as the paths share a common ancestry already. Cheers, --- Daniel Becroft

Re: Performance benchmarks

2011-03-29 Thread Daniel Becroft
On Sun, Mar 27, 2011 at 4:51 AM, Mark Phippard wrote: > On Fri, Mar 25, 2011 at 1:33 PM, Mark Phippard wrote: > > > I have been working on a framework for writing tests to record > > performance. I have something good enough to share: > > > > https://ctf.open.collab.net/sf/projects/csvn > > > >

[PATCH] Fix regression introduced in r1075802

2011-03-14 Thread Daniel Becroft
Hi, Below is a patch that fixes the regression introduced in r1075802. THe thread related to this regress can be found here: http://svn.haxx.se/dev/archive-2011-03/0145.shtml. Cheers, Daniel B. [[[ Fix regression introduced in r1075802, where conflict files were created during a dry-run merge.

Re: [PATCH] Add a test to cover the regression introduced in r1075802

2011-03-13 Thread Daniel Becroft
On Mon, Mar 14, 2011 at 7:06 AM, Daniel Becroft wrote: > On Sat, Mar 12, 2011 at 1:50 AM, C. Michael Pilato wrote: > >> On 03/11/2011 10:03 AM, Arwin Arni wrote: >> > Index: ../subversion/tests/c

Re: [PATCH] Add a test to cover the regression introduced in r1075802

2011-03-13 Thread Daniel Becroft
On Sat, Mar 12, 2011 at 1:50 AM, C. Michael Pilato wrote: > On 03/11/2011 10:03 AM, Arwin Arni wrote: > > Index: ../subversion/tests/cmdline/merge_tests.py > > === > > --- ../subversion/tests/cmdline/merge_tests.py(revision 1

Re: svn commit: r1075802 - in /subversion/trunk/subversion: libsvn_client/merge.c libsvn_wc/merge.c tests/cmdline/merge_tests.py

2011-03-08 Thread Daniel Becroft
On Sat, Mar 5, 2011 at 8:27 AM, Daniel Becroft wrote: > On Fri, Mar 4, 2011 at 11:35 PM, Arwin Arni wrote: > >> On Friday 04 March 2011 05:15 PM, Philip Martin wrote: >> >>> Arwin Arni writes: >>> >>> On Friday 04 March 2011 04:52 PM, Philip

Re: svn commit: r1075802 - in /subversion/trunk/subversion: libsvn_client/merge.c libsvn_wc/merge.c tests/cmdline/merge_tests.py

2011-03-04 Thread Daniel Becroft
On Fri, Mar 4, 2011 at 11:35 PM, Arwin Arni wrote: > On Friday 04 March 2011 05:15 PM, Philip Martin wrote: > >> Arwin Arni writes: >> >> On Friday 04 March 2011 04:52 PM, Philip Martin wrote: >>> Arwin Arni writes: Post this fix, I noticed that **merge --dry-run** throws an >

Re: [PATCH] Fix for issue 3826

2011-03-02 Thread Daniel Becroft
On Thu, Mar 3, 2011 at 3:34 AM, Noorul Islam K M wrote: > > Please find attached patch for issue 3826. All tests pass using 'make > check' > Hey Noorul, I had a quick look at this issue last night. It appears a similar issue exists for almost every command (I checked 'info', 'status' and 'updat

Re: [PATCH] Fix issue #3686 - executable bit not set during merge

2011-02-21 Thread Daniel Becroft
On Sun, Feb 13, 2011 at 2:15 AM, Daniel Shahaf wrote: > Daniel Becroft wrote on Sat, Feb 12, 2011 at 08:37:12 +1000: > > On Sat, Feb 12, 2011 at 7:31 AM, Daniel Shahaf >wrote: > > > > > Daniel Becroft wrote on Sat, Feb 12, 2011 at 06:27:31 +1000: > > > > O

Re: Unable to compile since r1072302

2011-02-20 Thread Daniel Becroft
2011/2/21 Branko Čibej > On 20.02.2011 22:05, Daniel Becroft wrote: > > ... > > /subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so.0: undefined > > reference to `svn_temp_serializer__add_string' > > collect2: ld returned 1 exit status > > > > I've n

Unable to compile since r1072302

2011-02-20 Thread Daniel Becroft
#x27;. I assume no-one else is having this problem (or no-one's noticed it yet), but is there anything else I need to do (do I need to go right back and re-run ./autogen.sh?) Cheers, --- Daniel Becroft

Re: Patches pending review

2011-02-15 Thread Daniel Becroft
On Tue, Feb 15, 2011 at 9:48 AM, Hyrum K Wright wrote: > On Mon, Feb 14, 2011 at 11:33 AM, Noorul Islam K M > wrote: > > > > See below in line more information about the patches. > > > > Noorul Islam K M writes: > ... > >> 3. Issue 3690 > >> > >>http://svn.haxx.se/dev/archive-2011-01/0414.sh

Re: [PATCH] Fix issue #3686 - executable bit not set during merge

2011-02-11 Thread Daniel Becroft
On Sat, Feb 12, 2011 at 7:31 AM, Daniel Shahaf wrote: > Daniel Becroft wrote on Sat, Feb 12, 2011 at 06:27:31 +1000: > > On Fri, Feb 11, 2011 at 11:26 PM, Daniel Shahaf >wrote: > > > Daniel Becroft wrote on Thu, Feb 10, 2011 at 07:21:30 +1000: > > > > @@ -111

Re: What is a "baton" from subversion sources?

2011-02-11 Thread Daniel Becroft
On Sat, Feb 12, 2011 at 6:07 AM, Grigory Petrov wrote: > Hello. > > I'm learning subversion API right now and examining it's source code and > examples. It's a lot of things in subversion source code that is called a > "baton". For example, svn_cmdline_create_auth_baton() create "auth baton", > an

Re: [PATCH] Fix issue #3686 - executable bit not set during merge

2011-02-11 Thread Daniel Becroft
On Fri, Feb 11, 2011 at 11:26 PM, Daniel Shahaf wrote: > [ disclaimer: I'm not familiar with wc internals yet; sorry; hope I'll > learn something while reviewing this ] > > Daniel Becroft wrote on Thu, Feb 10, 2011 at 07:21:30 +1000: > > > > > Hey

Re: [PATCH] Fix issue #3686 - executable bit not set during merge

2011-02-09 Thread Daniel Becroft
> > > Index: subversion/libsvn_wc/merge.c >> > === >> > --- subversion/libsvn_wc/merge.c (revision 1068136) >> > +++ subversion/libsvn_wc/merge.c (working copy) >> > @@ -1094,6 +1094,7 @@ >> >const char *l

Re: [PATCH] Fix issue #3686 - executable bit not set during merge

2011-02-08 Thread Daniel Becroft
On Wed, Feb 9, 2011 at 7:46 AM, Stefan Sperling wrote: > On Wed, Feb 09, 2011 at 07:34:53AM +1000, Daniel Becroft wrote: > > Hi, > > > > Attached is a completed patch to resolve issue 3686[1], where the > executable > > bit is not maintained during the merge of a

[PATCH] Fix issue #3686 - executable bit not set during merge

2011-02-08 Thread Daniel Becroft
executable): Remove @XFail decorator. ]]] [1] http://subversion.tigris.org/ds/viewMessage.do?dsForumId=463&dsMessageId=2635024 Cheers, Daniel B. --- Daniel Becroft Index: subversion/tests/cmdline/merge_tests.py === --- subversion

Re: [PATCH] Fix issue 3686 - executable flag is not maintained during a merge

2011-02-06 Thread Daniel Becroft
On Tue, Feb 1, 2011 at 12:24 AM, C. Michael Pilato wrote: > On 01/31/2011 12:21 AM, Daniel Becroft wrote: > > I'm submitting this patch as a "am I on the right track?" submission, > rather > > than a final job. I'll craft a log message if I'm correct.

Re: Roadmap : 1.7 Release Status : Test Review : XFails

2011-02-03 Thread Daniel Becroft
ge_tests.py >> > > You missed: > > merge_tests.py: > XFail(SkipUnless(merge_change_to_file_with_executable, > merge_tests.py-svntest.main.is_posix_os)), > > which Daniel Becroft (CC'd) recently added, and has submitted a pa

[PATCH] Fix issue 3686 - executable flag is not maintained during a merge

2011-01-30 Thread Daniel Becroft
Hi, Attached is a (work-in-progress) patch to fix issue 3686[1]. For those unfamiliar with the issue: when a binary file (with svn:executable set) is modified as a result of a merge, the executable flag is missing post-merge. A commit will restore the flag. I've looked into the code, and have fo

Re: Regarding issue 3690

2011-01-27 Thread Daniel Becroft
On 27/01/2011, at 17:04, Noorul Islam K M wrote: > Hi, > > I am planning to work on issue 3690. Before starting with this I have > few questions. > > 1. Hyrum updated the issue with his comment stating that already there > is work going on in the branch ignore-mergeinfo which addresses > s

Re: [PATCH] Add regression test for issue #3686:executable flag not correctly set on merge

2011-01-19 Thread Daniel Becroft
On Wed, Jan 19, 2011 at 7:36 AM, Daniel Shahaf wrote: > Daniel Becroft wrote on Wed, Jan 19, 2011 at 07:27:15 +1000: > > On Wed, Jan 19, 2011 at 3:08 AM, Daniel Shahaf >wrote: > > > Daniel Becroft wrote on Tue, Jan 18, 2011 at 07:13:12 +1000: > > > > 2)

Re: [PATCH] Add regression test for issue #3686:executable flag not correctly set on merge

2011-01-18 Thread Daniel Becroft
On Wed, Jan 19, 2011 at 3:08 AM, Daniel Shahaf wrote: > Daniel Becroft wrote on Tue, Jan 18, 2011 at 07:13:12 +1000: > > Hi guys, > > > > I was looking through the "Getting Involved" section of the Subversion > > website, and decided to start by writi

[PATCH] Add regression test for issue #3686:executable flag not correctly set on merge

2011-01-17 Thread Daniel Becroft
g svn:executable also sets the executable bit? 2) The problem also exists under the '--reintegrate' scenario, even after a subsequent commit. Would it be better to include that case here, or move the entire test to the merge_reintegrate.py suite? Regards, Daniel Becroft [[[ Add regression te

Re: 1.7.x - merge now accesses all files in WC?

2010-12-08 Thread Daniel Becroft
On Tue, Dec 7, 2010 at 12:39 PM, Hyrum K. Wright < hyrum_wri...@mail.utexas.edu> wrote: > On Mon, Dec 6, 2010 at 4:28 PM, Hyrum K. Wright > wrote: > > On Mon, Dec 6, 2010 at 3:15 PM, Daniel Becroft > wrote: > >> On Mon, Dec 6, 2010 at 8:50 PM, Daniel Becroft >

Re: 1.7 timing tests: update great, checkout needs work, upgrade horrible

2010-12-06 Thread Daniel Becroft
On Tue, Dec 7, 2010 at 2:01 PM, Blair Zajac wrote: > I'm working with a client and they have a large source source code checkout > that takes over 10 minutes do to an svn update. Their 1.6.x working copy > size is 3.6 GB with 74,000 files and 19,230 directories. The amount of IO > to do all th

Re: 1.7.x - merge now accesses all files in WC?

2010-12-06 Thread Daniel Becroft
On Mon, Dec 6, 2010 at 8:50 PM, Daniel Becroft wrote: > On Mon, Dec 6, 2010 at 7:13 PM, Daniel Shahaf wrote: > >> Instead of guessing which function causes the lstat() calls, could we >> have a tool tell? >> >> I've looked at 'ltrace -S', but it seems

Re: 1.7.x - merge now accesses all files in WC?

2010-12-06 Thread Daniel Becroft
785 Using additional breakpoints, I have verified that svn_wc__node_walk_children, svn_wc__internal_walk_children and walker_helper only get called once. It seems to be an issue within the walker_helper itself. I'll continue looking at it further - let me know if I'm barking up the wron

Re: 1.7.x - merge now accesses all files in WC?

2010-12-06 Thread Daniel Becroft
On Mon, Dec 6, 2010 at 8:09 AM, Stefan Sperling wrote: > On Mon, Dec 06, 2010 at 07:18:56AM +1000, Daniel Becroft wrote: > > On Fri, Dec 3, 2010 at 9:22 AM, Peter Samuelson wrote: > > > > > > > > [Daniel Becroft] > > > > I've just managed to bui

Re: 1.7.x - merge now accesses all files in WC?

2010-12-05 Thread Daniel Becroft
On Fri, Dec 3, 2010 at 9:22 AM, Peter Samuelson wrote: > > [Daniel Becroft] > > I've just managed to build/install trunk on my ubuntu box at home (first > > application I've ever compiled on it - yey!). > > > > What debugging tools would you recommend to i

Re: 1.7.x - merge now accesses all files in WC?

2010-12-02 Thread Daniel Becroft
On Fri, Dec 3, 2010 at 7:50 AM, Hyrum K. Wright < hyrum_wri...@mail.utexas.edu> wrote: > On Thu, Dec 2, 2010 at 3:43 PM, Daniel Becroft > wrote: > > On Wed, Dec 1, 2010 at 7:34 PM, Philip Martin < > philip.mar...@wandisco.com>wrote: > ... > >> > I can&

Re: 1.7.x - merge now accesses all files in WC?

2010-12-02 Thread Daniel Becroft
On Wed, Dec 1, 2010 at 7:34 PM, Philip Martin wrote: > Daniel Becroft writes: > > > Under 1.7.x, the following file(s) are accessed (merging the same > revision > > as above): > > > > - .svn\wc.db > > - Every versioned file in the working copy >

1.7.x - merge now accesses all files in WC?

2010-11-30 Thread Daniel Becroft
essed. I seem to recall some discussion about preventing/warning merging into modified working copies, could this be the cause? I've tried modifying files within the WC, but the merge still succeeds. --- Daniel Becroft

Re: 1.7.x bug - svn add no longer accepts wildcards?

2010-11-30 Thread Daniel Becroft
On Wed, Dec 1, 2010 at 1:25 AM, C. Michael Pilato wrote: > On 11/30/2010 07:02 AM, Daniel Becroft wrote: > > On Tue, Nov 30, 2010 at 7:18 PM, Branko Čibej wrote: > >> Not on windows, you have to link a magic library into your code to get > >> that behaviour. > >

Re: 1.7.x bug - svn add no longer accepts wildcards?

2010-11-30 Thread Daniel Becroft
On Tue, Nov 30, 2010 at 7:18 PM, Branko Čibej wrote: > > On 30.11.2010 05:32, Daniel Becroft wrote: > > Hi, > > > > During testing of a 1.7.x build, I've noticed that 'svn add' on trunk no > > longer accepts wildcards: > > > > svn 1.6.x: &g

1.7.x bug - svn add no longer accepts wildcards?

2010-11-29 Thread Daniel Becroft
k\A>D:\temp\svn_sandpit\svn7.exe add *.txt svn: warning: 'D:\temp\svn_sandpit\workingcopy\trunk\A\*.txt' not found I thought that wildcards were expanded by the OS/Shell, and then passed to SVN. Is this not the case? Cheers, --- Daniel Becroft

Re: WCNG - Upgrading working copies

2010-11-26 Thread Daniel Becroft
On Fri, Nov 26, 2010 at 11:58 PM, Mark Phippard wrote: > On Fri, Nov 26, 2010 at 8:02 AM, Stefan Sperling wrote: > > On Fri, Nov 26, 2010 at 02:05:55PM +1000, Daniel Becroft wrote: > >> Hi, > >> > >> I'm currently trialling the nightly builds that

WCNG - Upgrading working copies

2010-11-25 Thread Daniel Becroft
Is this kind of performance hit during an upgrade expected? Is the recommended upgrade option expected to be to use 'svn upgrade' or do get a fresh checkout? If you need stats regarding the working copy, I can provide them. Cheers, --- Daniel Becroft

Re: Tree conflicts on merging into a branch

2010-05-07 Thread Daniel Becroft
On Thu, May 6, 2010 at 4:16 PM, Matthias Weyh wrote: > Hello, > > Since I did not get any responses to my question on the users group and > this might be a bug I am reposting this to the dev user group. > > I am looking forward to your answers. > > Thanks, > Matthias > > -Ursprüngliche Nachric