[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Locking UI comments

From: <Daniel_Patterson_at_national.com.au>
Date: 2004-10-15 01:15:52 CEST

Branko ╚ibej <brane@xbc.nu> wrote on 10/15/2004 09:00:12 AM:
> I think svn should behave exactly as with "normal" conflicts, _except_
> that it should not try to merge changes into the working copy --
> regardless of whether the working copy has actually changed from BASE.
> For UI purposes, we could show an H(ijack) instead of a C(onflict), but
> the same information may well be conveyed by "svn st" marking the file
> as locked in the WC.

  What about the race condition where you've not yet added the
  svn:lock property to a file (i.e. it's decided to convert
  some file to use locking after it's been there for a while)?

  Consider:

    1) File dir/file has no svn:lock
    2) User A and user B do "svn co" to populate their WCs
    3) User B sets the svn:lock property on dir/file,
       in the meantime, user A starts editing dir/file.
    4) User B does "svn update ; svn lock dir/file"
       and is given a lock.
    5) User A tries to commit their changes. They recieve an
       "out of date" error, so they run "svn update".
       What happens now?

  Has user A hijacked the file, or is it a conflict?

daniel
This email is sent by or on behalf of the named sender identified above. If
you do not wish to receive any email marketing material from this person in
the future, please forward the contents of this email to
unsubscriptions@national.com.au with the word "unsubscribe" in the subject
box. If you do not forward the contents of this email with your
unsubscription then it may not be able to be implemented. If you wish to
unsubscribe from all central email marketing lists used by our business,
please forward the contents of this email to
unsubscriptions@national.com.au with the message "unsubscribe from all
central email marketing lists" in the subject box. If you do not forward
the contents of this email with your unsubscription then it may not be able
to be implemented.

The information contained in this email communication may be confidential.
You should only disclose, re-transmit, copy, distribute, act in reliance on
or commercialise the information if you are authorised to do so. Any views
expressed in this email communication are those of the individual sender,
except where the sender specifically states them to be the views of a
member of the National Australia Bank Group of companies. Any advice
contained in this e-mail has been prepared without taking into account your
objectives, financial situation or needs. Before acting on any advice in
this e-mail, National Australia Bank Limited recommends that you consider
whether it is appropriate for your circumstances. If this e-mail contains
reference to any financial products, the National recommends you consider
the Product Disclosure Statement (PDS) or other disclosure document before
making any decisions regarding any products. The National Australia Bank
Group of companies does not represent, warrant or guarantee that the
integrity of this communication has been maintained nor that the
communication is free of errors, virus or interference.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 15 01:16:20 2004

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.