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

List:       subversion-issues
Subject:    [Issue 1119] Changed - svn commit/cleanup fails because of diff3
From:       issues () subversion ! tigris ! org
Date:       2003-01-28 23:25:07
[Download RAW message or body]

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

*** Old
--- New
***************
*** 2,9 ****
  | svn commit/cleanup fails because of diff3                                  |
  +----------------------------------------------------------------------------+
  |      Issue #: 1119                      Component: subversion              |
! |       Status: NEW                         Version: current                 |
! |   Resolution:                            Platform: PC                      |
  |   Issue type: DEFECT                   OS/Version: Windows 2000            |
  |     Priority: P2                     Subcomponent: tools                   |
  +----------------------------------------------------------------------------+
--- 2,9 ----
  | svn commit/cleanup fails because of diff3                                  |
  +----------------------------------------------------------------------------+
  |      Issue #: 1119                      Component: subversion              |
! |       Status: RESOLVED                    Version: current                 |
! |   Resolution: FIXED                      Platform: PC                      |
  |   Issue type: DEFECT                   OS/Version: Windows 2000            |
  |     Priority: P2                     Subcomponent: tools                   |
  +----------------------------------------------------------------------------+
***************
*** 34,36 ****
--- 34,41 ----
  
  If I try to run diff3 myself on these files it works (the 'cygdiff' directory 
  is on the path).  I'm using svn-0.17.1-r4503-setup.exe.
+ 
+ ------- Additional Comments From brane@tigris.org  2003-01-28 15:25 PST -------
+ Fixed in revision 4578. For a workaround, see
+ 
+ http://subversion.tigris.org/project_faq.html#diff3-diff
\ No newline at end of file

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@subversion.tigris.org
For additional commands, e-mail: issues-help@subversion.tigris.org


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