New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[12] still trigger conflict resolution for existing entries when the curre… #6847

Merged
merged 2 commits into from Nov 9, 2017

Conversation

Projects
None yet
3 participants
@icewind1991
Member

icewind1991 commented Oct 16, 2017

…nt entry doesn't need it

Backport of #6846

@icewind1991 icewind1991 added this to the Nextcloud 12.0.4 milestone Oct 16, 2017

@icewind1991 icewind1991 requested review from rullzer and nickvergessen Oct 16, 2017

@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Oct 16, 2017

Codecov Report

Merging #6847 into stable12 will not change coverage.
The diff coverage is n/a.

@@             Coverage Diff             @@
##             stable12    #6847   +/-   ##
===========================================
  Coverage       53.75%   53.75%           
  Complexity      22587    22587           
===========================================
  Files            1384     1384           
  Lines           86651    86651           
  Branches         1329     1329           
===========================================
  Hits            46577    46577           
  Misses          40074    40074

codecov bot commented Oct 16, 2017

Codecov Report

Merging #6847 into stable12 will not change coverage.
The diff coverage is n/a.

@@             Coverage Diff             @@
##             stable12    #6847   +/-   ##
===========================================
  Coverage       53.75%   53.75%           
  Complexity      22587    22587           
===========================================
  Files            1384     1384           
  Lines           86651    86651           
  Branches         1329     1329           
===========================================
  Hits            46577    46577           
  Misses          40074    40074
@MorrisJobke

This comment has been minimized.

Show comment
Hide comment
@MorrisJobke
Member

MorrisJobke commented Nov 7, 2017

Waiting for #6846 (comment)

icewind1991 added some commits Oct 16, 2017

still trigger conflict resolution for existing entries when the curre…
…nt entry doesn't need it

Signed-off-by: Robin Appelman <robin@icewind.nl>
never show '/' as path for conflicting file names
Signed-off-by: Robin Appelman <robin@icewind.nl>
@MorrisJobke

This comment has been minimized.

Show comment
Hide comment
@MorrisJobke

MorrisJobke Nov 7, 2017

Member

I force updated this branch with the commits from #6846

Member

MorrisJobke commented Nov 7, 2017

I force updated this branch with the commits from #6846

@MorrisJobke

Tested and works 👍

@MorrisJobke MorrisJobke requested review from ChristophWurst and blizzz Nov 7, 2017

@rullzer

rullzer approved these changes Nov 9, 2017

@MorrisJobke MorrisJobke merged commit c91515c into stable12 Nov 9, 2017

3 checks passed

codecov/patch Coverage not affected when comparing 70e2072...fe6b4d4
Details
codecov/project 53.75% remains the same compared to 70e2072
Details
continuous-integration/drone/pr the build was successful
Details

@MorrisJobke MorrisJobke deleted the filelist-confict-path-12 branch Nov 9, 2017

@MorrisJobke MorrisJobke referenced this pull request Nov 20, 2017

Merged

12.0.4 RC #7225

1 of 1 task complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment