[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-issues
Subject:    [Issue 418] Changed - Class Action Suit:  SVN Users v. FS merge()
From:       issues () subversion ! tigris ! org
Date:       2001-07-19 20:34:00
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=418

*** shadow/issues_15/418	Thu Jul 19 13:32:08 2001
--- shadow/issues_15/418.tmp.9095	Thu Jul 19 13:34:00 2001
***************
*** 11,20 ****
  |  Reported By: cmpilato@tigris.org                                          |
  |      CC list: Cc:                                                          |
  +----------------------------------------------------------------------------+
! |    Milestone: TargetMilestone: ---                                         |
  |          URL:                                                              |
  +============================================================================+
  |                              DESCRIPTION                                   |
  This issue exists to track the existence of modifications to the filesystem's
  merge functionality that deviate from the philosophically sound model in favor
  of Subversion's ease of use.
\ No newline at end of file
--- 11,36 ----
  |  Reported By: cmpilato@tigris.org                                          |
  |      CC list: Cc:                                                          |
  +----------------------------------------------------------------------------+
! |    Milestone: TargetMilestone: M3                                          |
  |          URL:                                                              |
  +============================================================================+
  |                              DESCRIPTION                                   |
  This issue exists to track the existence of modifications to the filesystem's
  merge functionality that deviate from the philosophically sound model in favor
  of Subversion's ease of use.
+ 
+ ------- Additional Comments From cmpilato@tigris.org  2001-07-19 13:33 -------
+ An example of this deviation (a recent log message):
+ 
+ * subversion/libsvn_fs/tree.c
+ 
+   (merge): Allow as a non-conflicting case where:
+ 
+      Entry E exists in ANCESTOR but has been deleted from SOURCE.
+      Entry E exists in ANCESTOR and in TARGET, but is not the same
+ node.
+  
+ * subversion/tests/libsvn_fs/fs-test.c
+ 
+   (merging_commit): Modify this test to verify the above new
+ allowance.

[prev in list] [next in list] [prev in thread] [next in thread]