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

Better handling for multiple files from same repository #451

Merged
merged 2 commits into from
Dec 12, 2014

Conversation

mexx
Copy link
Member

@mexx mexx commented Dec 12, 2014

related to #407

  • Add conflict detection for source files
  • Adjust download process for source files to ensure all files are correctly downloaded during restore process

@@ -61,6 65,31 @@ let resolve getDependencies getSha1 (file : UnresolvedSourceFile) : ResolvedSour

{ resolved with Dependencies = dependencies }

let private detectConflicts (remoteFiles : UnresolvedSourceFile list) : unit =
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we get detectConflicts under test?

@forki forki merged commit 0eedab1 into fsprojects:master Dec 12, 2014
@mexx mexx deleted the multiple-files branch December 13, 2014 18:57
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.

None yet

2 participants