Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-3565

svn patch should mark targets with rejected hunks as conflicted

    Details

    • Type: Bug
    • Status: Open
    • Priority: Major
    • Resolution: Unresolved
    • Affects Version/s: trunk
    • Fix Version/s: 1.10-consider
    • Component/s: libsvn_client
    • Labels:
      None

      Description

      When hunks are rejected during the patching process, svn patch currently
      produces reject files for the rejected hunks, but does not mark the target as
      conflicted in the working copy. It should do so, however, for consistency with
      the update and merge operations.
      

        Activity

        Hide
        julianfoad Julian Foad added a comment -

        Bump all open 1.8-consider issues to 1.10-consider, now that they have missed
        the boat for 1.8 (and 1.9).
        

        Show
        julianfoad Julian Foad added a comment - Bump all open 1.8-consider issues to 1.10-consider, now that they have missed the boat for 1.8 (and 1.9).
        Hide
        stsp Stefan Sperling added a comment -

        Move to 1.8-consider. New conflict storage has been postponed to post-1.7.
        

        Show
        stsp Stefan Sperling added a comment - Move to 1.8-consider. New conflict storage has been postponed to post-1.7.

          People

          • Assignee:
            Unassigned
            Reporter:
            stsp Stefan Sperling
          • Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

            • Created:
              Updated:

              Development