Re: SVN basic questions.
Den fre 20 aug. 2021 kl 05:02 skrev A Z : > -Can you commit after adding, to a branch node? > Yes. Branches are nothing special in Subversion, just another folder (copied from somewhere). Then you may, by convention and project guidelines, have restrictions on what you can do and should do in a branch. > -Can multiple users add to a committed branch node, and que up > adds, or is this in fact going to nothing, while granting a message? > Is it the case that only the first add to the branch node will be added, > queued, while others will be rejected until that first node is committed? > You can commit as you would normally do in /trunk. Any conflicts will be managed when updating the working copy (before commit, if needed). (You can configure a file to require locking, but that is a separate question from branching. To edit a locked file you must aquire the lock from the server and only one person at a time can hold the lock to a certain file. There is no locking on folder level). Kind regards, Daniel
Re: SVN basic questions.
Daniel Sahlberg wrote on Fri, 20 Aug 2021 07:55 +00:00: > Den fre 20 aug. 2021 kl 05:02 skrev A Z : > > -Can multiple users add to a committed branch node, and que up > > adds, or is this in fact going to nothing, while granting a message? > > Is it the case that only the first add to the branch node will be added, > > queued, while others will be rejected until that first node is committed? > > You can commit as you would normally do in /trunk. Any conflicts will > be managed when updating the working copy (before commit, if needed). It might help to clarify the terminology here. Subversion's own documentation does not use the term "queueing" at all, and does not use the term "add" except in the narrow sense of an operation that results in a new versioned directory entry. «add» is a local operation (doesn't contact the server). It's not clear to me what sense you use those two terms in. In particular, when you write "until that first node is committed", you seem to be assuming some sort of interim state, a "node" that has been "added" but not been "committed", and that affects other users. There's no such thing. The repository is a versioned filesystem tree. Changes to that tree (commits) are made transactionally. A commit that has not completed does not affect other commits in any way (cf. ACID). > (You can configure a file to require locking, but that is a separate > question from branching. To edit a locked file you must aquire the lock > from the server and only one person at a time can hold the lock to a > certain file. There is no locking on folder level).
Re: Crash in token.c after incomplete cherry pick merges in 1.15
On Tue, Aug 10, 2021 at 02:46:50PM +0200, Stefan Sperling wrote: > On Mon, Aug 09, 2021 at 06:19:38PM -0400, Joshua Kordani wrote: > > Attached is a script to reproduce the error. > > > > I also have a packed rr debugger session that I can provide (I highly > > recommend the rr reversible debugger). Its ~30meg > > Thank you Joshua! The patch below makes your test script succeed for me. > > Ideally I should commit a regression test together with this patch. > I will need to find time to convert your script into a regression test. I have finally gotten around this now. Test added in https://svn.apache.org/r1892470 Fix committed in https://svn.apache.org/r1892471 Nominated for backport to 1.14.x in https://svn.apache.org/r1892472 Thanks for your report, Joshua! Regards, Stefan
Re: Crash in token.c after incomplete cherry pick merges in 1.15
My pleasure!On Aug 20, 2021 08:45, Stefan Sperling wrote:On Tue, Aug 10, 2021 at 02:46:50PM +0200, Stefan Sperling wrote: > On Mon, Aug 09, 2021 at 06:19:38PM -0400, Joshua Kordani wrote: > > Attached is a script to reproduce the error. > > > > I also have a packed rr debugger session that I can provide (I highly > > recommend the rr reversible debugger). Its ~30meg > > Thank you Joshua! The patch below makes your test script succeed for me. > > Ideally I should commit a regression test together with this patch. > I will need to find time to convert your script into a regression test. I have finally gotten around this now. Test added in https://svn.apache.org/r1892470 Fix committed in https://svn.apache.org/r1892471 Nominated for backport to 1.14.x in https://svn.apache.org/r1892472 Thanks for your report, Joshua! Regards, Stefan CONFIDENTIALITY NOTICE: This communication may contain private, confidential and privileged material for the sole use of the intended recipient. If you are not the intended recipient, please delete this e-mail and any attachments permanently.
