Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-07 21:00:54 +01:00
Code Issues Packages Projects Releases Activity

Merge with 2.0.0-m3

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-13 08:17:51 +02:00
parent 9aa9b77922 470909199e
commit 7c76f7a699
238 changed files with 39409 additions and 2064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-it/src/test/java/sonia/scm/it/RepositoryUtil.java
View File

@@ -43,6 +43,7 @@ public class RepositoryUtil {
static Changeset createAndCommitFile(RepositoryClient repositoryClient, String username, String fileName, String content) throws IOException {
File file = new File(repositoryClient.getWorkingCopy(), fileName);
Files.createParentDirs(file);
Files.write(content, file, Charsets.UTF_8);
addWithParentDirectories(repositoryClient, file);
return commit(repositoryClient, username, "added " + fileName);
@@ -53,7 +54,6 @@ public class RepositoryUtil {
String thisName = file.getName();
String path;
if (!repositoryClient.getWorkingCopy().equals(parent)) {
addWithParentDirectories(repositoryClient, parent);
path = addWithParentDirectories(repositoryClient, parent) + File.separator + thisName;
} else {
path = thisName;