You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+3-3Lines changed: 3 additions & 3 deletions
Original file line number
Diff line number
Diff line change
@@ -4,9 +4,9 @@
4
4
Pk-vcs-git is lightweight library for execute basic Git VCS operations (merge, branch create etc). It uses [pk-vcs-api](https://github.com/ProjectKaiser/pk-vcs-api) exposing IVCS implementation for Git repositories and [JGit](https://eclipse.org/jgit/) as framework to work with Git repositories.
5
5
Features:
6
6
- Branch create and remove
7
-
- Branch merge returning result (success or list of conflicted files)
7
+
- Branch merge with result return (success or list of conflicted files)
8
8
- Branch commits messages list
9
-
- Summarized branch changes list
9
+
- Summarized diff between branches
10
10
- Branches list
11
11
- File content getting and setting
12
12
- File create and remove
@@ -73,7 +73,7 @@ Features:
73
73
-`PK_VCS_TEST_GITHUB_PASS` environment var or JVM var is used as user password for access to Github
74
74
- New Test Repository is created before each test and deletes automatically after each test
75
75
- To execute tests just run GitVCSTest class as JUnit test. Tests from VCSAbstractTest class will be executed. See [pk-vcs-test](https://github.com/ProjectKaiser/pk-vcs-test) for details
76
-
- NOTE: Github has some latency for exposing results of previously executed operations. For example if create a new branch and immediately check branches list then Github could return old branches list. 2 seconds awaiting is added for testing. Also if a test failed then try to execute it again.
76
+
- NOTE: Github has some latency for exposing results of previously executed operations. For example if create a new branch and immediately check branches list then Github could return old branches list. If a test is failed then try to execute it again. Also use `GitVCS.setExpectedLatency()` to set delay for 'dangerous' operations.
77
77
78
78
# Limitations
79
79
- Commit messages can not be attached to branch create and delete operations because Git does not exposes these operations as separate commits
0 commit comments