[Rt-commit] r8393 - in rt/branches/3.7-EXPERIMENTAL-TUNIS: docs

[thayes at bestpractical.com]

Author: thayes
Date: Fri Aug  3 15:26:23 2007
New Revision: 8393

Modified:
   rt/branches/3.7-EXPERIMENTAL-TUNIS/   (props changed)
   rt/branches/3.7-EXPERIMENTAL-TUNIS/docs/locking

Log:
 r8584 at toth:  toth | 2007-08-03 15:25:19 -0400
 * Added commentary on what happens in case of a merge of a locked ticket
 


Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/docs/locking
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/docs/locking	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/docs/locking	Fri Aug  3 15:26:23 2007
@@ -65,6 +65,11 @@
 - When a user accesses a page for a ticket that has been locked by another user, they are given a notification of the
   other user's lock, with the locking user's name and how long they have had it locked for.
 
+- When a locked ticket (hard or Take lock) is merged into another ticket, the ticket being merged into will get the lock
+  type of the ticket being merged from. This lock shift is conditional upon priority, as usual--if the merged from 
+  ticket has a lock of a lower priority than the merged-to ticket, the merged-to ticket will retain its lock. If the 
+  merged-to ticket is locked by a different user, that user will retain the lock. Basically, the merged-to ticket will
+  retain its lock if it is higher priority than the lock on the ticket being merged from.