cp: handle update prompt with and without interactive mode enabled #6207
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@BenWiederhake: kudos for how you handled this situation :) @Vikrant2691: thanks for your PR! |
|
Hi Ben,
Yes the commits are the same.. we are good.. I could have you mailed
earlier apologies for that..
…On Tue, Apr 9, 2024, 17:29 Ben Wiederhake ***@***.***> wrote:
This is #6069 <#6069>.
To recap what this PR does: If -u is given, don't consider overwriting.
If not considering overwriting, don't ask even if -i is given.
Reason: While trying to rebase and push his PR, I accidentally overwrite
Vikrant's main branch, which caused his original PR to be closed, which
caused me no longer having implicit write permission to his branch. I guess
I'll just never use that GitHub feature again.
@Vikrant2691 <https://github.com/Vikrant2691> Please sanity-check whether
this looks correct. git diff says there is no difference in content
between c94809b
<c94809b>
(your original final commit) and 9b9c0cc
<9b9c0cc>
(this commit).
------------------------------
You can view, comment on, or merge this pull request online at:
#6207
Commit Summary
- 9b9c0cc
<9b9c0cc>
cp: handle update prompt with and without interactive mode enabled
File Changes
(2 files <https://github.com/uutils/coreutils/pull/6207/files>)
- *M* src/uu/cp/src/cp.rs
<https://github.com/uutils/coreutils/pull/6207/files#diff-fed63f74214c092a801901cdce011f1941f6378a84d9c7947b5bd02adce2de43>
(14)
- *M* tests/by-util/test_cp.rs
<https://github.com/uutils/coreutils/pull/6207/files#diff-f5061732a0f5bf5179b66bdd229c5a93bfdd48f647c68226f42e6ca99429f15a>
(31)
Patch Links:
- https://github.com/uutils/coreutils/pull/6207.patch
- https://github.com/uutils/coreutils/pull/6207.diff
—
Reply to this email directly, view it on GitHub
<#6207>, or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AI3BNPSDTQAR75DWRKZT3DDY4PUKJAVCNFSM6AAAAABF6SYUNCVHI2DSMVQWIX3LMV43ASLTON2WKOZSGIZTGNBUGU2DAMA>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
Cool 🎉
…On Thu, Apr 11, 2024, 16:57 Daniel Hofstetter ***@***.***> wrote:
@BenWiederhake <https://github.com/BenWiederhake>: kudos for how you
handled this situation :)
@Vikrant2691 <https://github.com/Vikrant2691>: thanks for your PR!
—
Reply to this email directly, view it on GitHub
<#6207 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AI3BNPTIGJDXV7SLU6KNY7DY42CENAVCNFSM6AAAAABF6SYUNCVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDANBZGYZTOMJQGA>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is #6069.
To recap what this PR does: If
-uis given, don't consider overwriting. If not considering overwriting, don't ask even if-iis given.Reason: While trying to rebase and push his PR, I accidentally overwrite Vikrant's
mainbranch, which caused his original PR to be closed, which caused me no longer having implicit write permission to his branch. I guess I'll just never use that GitHub feature again.@Vikrant2691 Please sanity-check whether this looks correct.
git diffsays there is no difference in content between c94809b (your original final commit) and 9b9c0cc (this commit).