Skip to content
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

added a clashes command #532

Merged
merged 1 commit into from
Dec 26, 2015
Merged

added a clashes command #532

merged 1 commit into from
Dec 26, 2015

Conversation

odeke-em
Copy link
Owner

Added ability to:

  • List clashes.
  • Fix clashes.

Listing clashes

$ drive clashes dup-tests/a/b/c/d/e
These paths clash
X /dup-tests/a/b/c/d/e/f 0By5qQkvRAeV2Wk9FaEN4ZzNock0
X /dup-tests/a/b/c/d/e/f/g 0By5qQkvRAeV2amN5aFgzc1htVXM
X /dup-tests/a/b/c/d/e/f/g 0By5qQkvRAeV2N21ETkVCTHpkcEE
X /dup-tests/a/b/c/d/e/f/g/h/i 0By5qQkvRAeV2TWdVb29DRlVXR1k
X /dup-tests/a/b/c/d/e/f/g/h/i 0By5qQkvRAeV2Vk9lY3Y2SjFDYlE
X /dup-tests/a/b/c/d/e/f 0By5qQkvRAeV2TzE3LXNWVFNoaHM
X /dup-tests/a/b/c/d/e/f 0By5qQkvRAeV2NmEwUmFQOEZ0dE0
X /dup-tests/a/b/c/d/e/f 0By5qQkvRAeV2bm5ZRVpELXRHTWM

Fixing clashes

$ drive clashes --fix [paths...]
$ drive clashes  --fix dup-tests/a/b/c/d/e
Some clashes found, we can fix them by following renames:
/dup-tests/a/b/c/d/e/f 0By5qQkvRAeV2TzE3LXNWVFNoaHM -> f_0
/dup-tests/a/b/c/d/e/f 0By5qQkvRAeV2NmEwUmFQOEZ0dE0 -> f_1
/dup-tests/a/b/c/d/e/f 0By5qQkvRAeV2bm5ZRVpELXRHTWM -> f_2
/dup-tests/a/b/c/d/e/f/g 0By5qQkvRAeV2N21ETkVCTHpkcEE -> g_0
/dup-tests/a/b/c/d/e/f/g/h/i 0By5qQkvRAeV2Vk9lY3Y2SjFDYlE -> i_0
Proceed with the changes [Y/N] ? 

Fixes #447.

Added ability to:
* List clashes.
* Fix clashes.
@odeke-em odeke-em merged commit 531e0be into master Dec 26, 2015
@odeke-em odeke-em deleted the fix-clashes branch February 4, 2016 08:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant