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

List:       subversion-issues
Subject:    [Issue 398] New - discuss possible new ".drej" conflict files
From:       issues () subversion ! tigris ! org
Date:       2001-06-11 20:19:34
[Download RAW message or body]

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

*** shadow/issues_15/398	Mon Jun 11 13:19:34 2001
--- shadow/issues_15/398.tmp.19858	Mon Jun 11 13:19:34 2001
***************
*** 0 ****
--- 1,29 ----
+ +============================================================================+
+ | discuss possible new ".drej" conflict files                                |
+ +----------------------------------------------------------------------------+
+ |      Issue #: 398                       Component: subversion              |
+ |       Status: NEW                         Version: current                 |
+ |   Resolution:                            Platform: Other                   |
+ |   Issue type: TASK                     OS/Version: other                   |
+ |     Priority: P3                     Subcomponent: src                     |
+ +----------------------------------------------------------------------------+
+ |  Assigned To: bugs@subversion.tigris.org                                   |
+ |  Reported By: sussman@tigris.org                                           |
+ |      CC list: Cc:                                                          |
+ +----------------------------------------------------------------------------+
+ |    Milestone: TargetMilestone: ---                                         |
+ |          URL:                                                              |
+ +============================================================================+
+ |                              DESCRIPTION                                   |
+ So far, we have defined a file to be in "conflict" if a patch failed to apply. 
+ The file stops being in conflict iff a particular .rej file is removed.
+ 
+ But what about other kinds of conflict?  What if I schedule a file for deletion,
+ and the 'svn up' tries to patch the file?   Does it make sense to mark the file
+ as in Conflict?  If so, how would we know when it's no longer in conflict?  
+ 
+ There's no .rej file -- although maybe we could create one with a human-readable
+ message in it, much like our ".prej" files.  If we create a ".drej" containing a
+ verbal description of the conflict, we'd have a set indicator about the user's
+ intentions.  If the .drej is removed, then we can assume the user resolved the
+ problem and is allowed to commit.
\ No newline at end of file

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