subversion-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Evgeny Kotkov (JIRA)" <j...@apache.org>
Subject [jira] [Updated] (SVN-4739) Tree conflict resolver: "Accept incoming deletion" option doing nothing for a locally deleted file
Date Wed, 25 Apr 2018 14:13:00 GMT

     [ https://issues.apache.org/jira/browse/SVN-4739?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Evgeny Kotkov updated SVN-4739:
-------------------------------
    Description: 
Within the tree conflict resolver, using the "Accept incoming deletion" option for a locally
deleted file can (unexpectedly) do nothing and leave the tree conflict unresolved.

Consider the following PowerShell-based reproduction script:

 {{    rm test -Recurse -Force -ErrorAction Ignore}}
 {{    mkdir test}}
 {{    svnadmin create test/repo}}
 {{    $url = 'file:///\{0}/test/repo' -f (pwd) -replace '&#92;&#92;', '/'}}
 {{    svn co $url test/wc}}
 {{    echo content > test/wc/file.txt}}
 {{    svn add test/wc/file.txt}}
 {{    svn ci test/wc -m"r1"}}
 {{    svn rm test/wc/file.txt}}
 {{    svn ci test/wc -m"r2"}}
 {{    svn up test/wc -r1}}
 {{    svn rm test/wc/file.txt}}
 {{    svn up test/wc}}
 {{    svn st test/wc}}

The result of choosing "(a) Accept incoming deletion" during conflict resolution is unexpected:

 {{  > svn up}}

 {{    Updating 'test\wc':(}}
 {{        C test\wc\file.txt}}
 {{    At revision 2.}}
 {{    Summary of conflicts:}}
 {{      Tree conflicts: 1}}
 {{    Searching tree conflict details for 'test\wc\file.txt' in repository:}}
 {{    Checking r2... done}}
 {{    Tree conflict on 'test\wc\file.txt':}}
 {{    File updated from r1 to r2 was deleted by (me) in r2.}}
 {{    A deleted file was found in the working copy.}}
 {{    Select: (p) Postpone, (r) Mark as resolved, (a) Accept incoming deletion,}}
 {{            (h) Help, (q) Quit resolution: a}}
 {{    Summary of conflicts:}}
 {{      Tree conflicts: 1}}

 {{    > svn st}}

 {{    !   C test\wc\file.txt}}
 {{        > local file delete, incoming file delete or move upon update}}
 {{    Summary of conflicts:}}
 {{      Tree conflicts: 1}}

  was:
Within the tree conflict resolver, using the "Accept incoming deletion" option for a locally
deleted file can (unexpectedly) do nothing and leave the tree conflict unresolved.

Consider the following PowerShell-based reproduction script:

{{    rm test -Recurse -Force -ErrorAction Ignore}}
 {{    mkdir test}}
 {{    svnadmin create test/repo}}
 {{    $url = 'file:///\{0}/test/repo' -f (pwd) -replace '\\}}{{', '/'}}
 {{    svn co $url test/wc}}
 {{    echo content > test/wc/file.txt}}
 {{    svn add test/wc/file.txt}}
 {{    svn ci test/wc -m"r1"}}
 {{    svn rm test/wc/file.txt}}
 {{    svn ci test/wc -m"r2"}}
 {{    svn up test/wc -r1}}
 {{    svn rm test/wc/file.txt}}
 {{    svn up test/wc}}
 {{    svn st test/wc}}

The result of choosing "(a) Accept incoming deletion" during conflict resolution is unexpected:

{{  > svn up}}

{{    Updating 'test\wc':(}}
 {{    C test\wc\file.txt}}
 {{    At revision 2.}}
 {{    Summary of conflicts:}}
 {{    Tree conflicts: 1}}
 {{    Searching tree conflict details for 'test\wc\file.txt' in repository:}}
 {{    Checking r2... done}}
 {{    Tree conflict on 'test\wc\file.txt':}}
 {{    File updated from r1 to r2 was deleted by (me) in r2.}}
 {{    A deleted file was found in the working copy.}}
 {{    Select: (p) Postpone, (r) Mark as resolved, (a) Accept incoming deletion,}}
 {{    (h) Help, (q) Quit resolution: a}}
 {{    Summary of conflicts:}}
 {{    Tree conflicts: 1}}

{{    > svn st}}

{{    ! C test\wc\file.txt}}
 {{    > local file delete, incoming file delete or move upon update}}
 {{    Summary of conflicts:}}
 {{    Tree conflicts: 1}}


> Tree conflict resolver: "Accept incoming deletion" option doing nothing for a locally
deleted file
> --------------------------------------------------------------------------------------------------
>
>                 Key: SVN-4739
>                 URL: https://issues.apache.org/jira/browse/SVN-4739
>             Project: Subversion
>          Issue Type: Bug
>          Components: cmdline client
>    Affects Versions: 1.10.0
>            Reporter: Evgeny Kotkov
>            Priority: Minor
>
> Within the tree conflict resolver, using the "Accept incoming deletion" option for a
locally deleted file can (unexpectedly) do nothing and leave the tree conflict unresolved.
> Consider the following PowerShell-based reproduction script:
>  {{    rm test -Recurse -Force -ErrorAction Ignore}}
>  {{    mkdir test}}
>  {{    svnadmin create test/repo}}
>  {{    $url = 'file:///\{0}/test/repo' -f (pwd) -replace '&#92;&#92;', '/'}}
>  {{    svn co $url test/wc}}
>  {{    echo content > test/wc/file.txt}}
>  {{    svn add test/wc/file.txt}}
>  {{    svn ci test/wc -m"r1"}}
>  {{    svn rm test/wc/file.txt}}
>  {{    svn ci test/wc -m"r2"}}
>  {{    svn up test/wc -r1}}
>  {{    svn rm test/wc/file.txt}}
>  {{    svn up test/wc}}
>  {{    svn st test/wc}}
> The result of choosing "(a) Accept incoming deletion" during conflict resolution is unexpected:
>  {{  > svn up}}
>  {{    Updating 'test\wc':(}}
>  {{        C test\wc\file.txt}}
>  {{    At revision 2.}}
>  {{    Summary of conflicts:}}
>  {{      Tree conflicts: 1}}
>  {{    Searching tree conflict details for 'test\wc\file.txt' in repository:}}
>  {{    Checking r2... done}}
>  {{    Tree conflict on 'test\wc\file.txt':}}
>  {{    File updated from r1 to r2 was deleted by (me) in r2.}}
>  {{    A deleted file was found in the working copy.}}
>  {{    Select: (p) Postpone, (r) Mark as resolved, (a) Accept incoming deletion,}}
>  {{            (h) Help, (q) Quit resolution: a}}
>  {{    Summary of conflicts:}}
>  {{      Tree conflicts: 1}}
>  {{    > svn st}}
>  {{    !   C test\wc\file.txt}}
>  {{        > local file delete, incoming file delete or move upon update}}
>  {{    Summary of conflicts:}}
>  {{      Tree conflicts: 1}}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Mime
View raw message