Matthias Sohn
450ce163ef
JGit v3.5.1.201410131835-r
...
Change-Id: I37e049c8e81f963cfb7c17f1af91fd4245766aee
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
848186da86
Prepare 3.5.1-SNAPSHOT builds
...
Change-Id: Ibf89f996c9d9a7e431ee09261987bb76246de441
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
24a2f9e53d
JGit v3.5.0.201409260305-r
...
Change-Id: Ibf382bda3dcbb4b70829b1dd3a8abfd07bc4879e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
66559681dd
Prepare post 3.5.0-rc1 builds
...
Change-Id: Id9e01b867bff0ed10e887c15a12e5399b788b68e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
48820c7b07
JGit 3.5.0.201409071800-rc1
...
Change-Id: I59e5e2492820da111df1837fbf3649a2ae03841c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
6ccf609e89
Prepare 3.6.0-SNAPSHOT builds
...
Change-Id: I2d8c3768998c0cfc8d02d11009bc5b7ed1d75778
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Christian Halstrick
0c4553d28a
Fix RecursiveMerger's internal use of merge to find a merge base
...
When RecursiveMerger tried to determine a common base tree it was
recursively tried to merge multiple common bases. But these intermediate
merges which have just been done to determine a single common base for
the final merge already filled some important fields (toBeCheckedOut,
toBeDeleted, ...). These side effects of the intermediate merges led to
wrong results of the final merge. One symptom was that after a recursive
merge which should be succesful you could still see leftover files in
the worktree: files which existed in the (virtual) common base but which
don't exist anymore in the branches to be merged.
The solution is easy: Clear the appropriate fields after common base
determination and start the final merge with a clean state.
Change-Id: I644ea9e1cb15360f7901bc0483cdb9286308c226
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
11 years ago
Robin Rosenberg
a03bdcbbb4
Don't warn for methods that can be static
...
Making the methods static would gain little in performance,
make the code harder to change. Removing unncessary warnings
is more important.
Change-Id: If3e6aa9c1d92e58b4e7a8e246cf4aace237d7a7b
11 years ago
Robin Rosenberg
8032b64980
Add new default settings from Eclipse 4.4
...
These settings were added by Eclipse simply by touching
the project settings. Adding these makes it simpler to see
what local changes have been made.
Change-Id: Iab0aa62530312eb0c78b03b5c6a632742bcc4978
11 years ago
Robin Rosenberg
0f14d3bf40
Try to fix intermittent test failure related to file timestamps
...
Improve how tests do a "touch" operation on files. Instead of doing
"f.setLastModified(System.currentTimeMillis)" open a Outputstream on the
file and directly close it again. This makes this method rely only on
one clock - the clock of the filesystem.
Bug: 436917
Change-Id: I68ef3c2878f28b12daebf2ef6a9fa0a5d6e0964d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
7865d7100e
Prepare 3.4.2-SNAPSHOT builds
...
Change-Id: If88217d84b88cda6d04c159418d5bc86233fe28c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
03f6e83c40
JGit v3.4.1.201406201815-r
...
Change-Id: I4383a90fd91a243cd5ce5d0ae4e53874b36c1f47
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
126eb94f77
Prepare post 3.4.0 builds
...
Change-Id: I49f3741f3973b247a635f7c99b72309d2381a377
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
d0daad884f
JGit v3.4.0.201406110918-r
...
Change-Id: I56543234316f04bff4e45628bcb8286a6e52e31f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Robin Rosenberg
64b0531c35
Prepare 3.5.0-SNAPSHOT builds
...
Change-Id: I53bd500188e09ae2e007a58b3cd89aa0805d6f2a
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
11 years ago
Matthias Sohn
3b83e1a398
Prepare post 3.4 RC3 builds
...
Change-Id: I9730bb349d0295c811aa3a9ba0f67bd946e86d1e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
dd06dcdcf2
JGit v3.4.0.201406041058-rc3
...
Change-Id: If0cfec023788cae7713dd1ccc250e221365ef984
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
386dff2271
Prepare post 3.4.0 RC2 builds
...
Change-Id: Id8d784ba7b0aba7c6a00f459bf1ac54c1d36d061
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
314fade855
JGit v3.4.0.201405281120-rc2
...
Change-Id: Ifd376f58cf867fc84d39582c49e971d998abf63d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
0e13adb9cf
Prepare post 3.4.0 RC1 builds
...
Change-Id: Ia8d29046439bc9134acdf7c88ab85ea49c4ddf47
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
d2d56e9efb
JGit v3.4.0.201405211411-rc1
...
Change-Id: Ia3834770b9719f64cbdfd0338034c392fa3ae5db
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
3a47e45c32
Prepare 3.4.0-SNAPSHOT builds
...
Change-Id: I5cf20c875c3e92e12c2b22465774ba42513b9add
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
f6c42684d9
JGit v3.4.0.201405051725-m7
...
Change-Id: I8d941d22becdf019199a1c0fe28aa5835038647d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
50d8cf5ca5
JGit v3.3.2.201404171909-r
...
Change-Id: I1d7e40156d0b6e30bd5f3a40f18c836b7d1ba78f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
5073000c3f
Prepare 3.3.2-SNAPSHOT builds
...
Change-Id: I48271980a258acd0ada7c418b24c61c1bf0a0cd2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
f3f2060b5c
JGit v3.3.1.201403241930-r
...
Change-Id: Ib317903898095d205f0b6ed4cead62ff6eabd894
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
47207e98d4
Prepare 3.4.0-SNAPSHOT builds
...
Change-Id: I907c6f1834c06b8ab4d3e0f76dde475faea7b4a5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
c1fee1d16b
Prepare 3.3.1-SNAPSHOT builds
...
Change-Id: If15560f2731e54dbf9db88d8a308b4c25ce27e8e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
3d855dbfc6
JGit v3.3.0.201403021825-r
...
Change-Id: Iaf3da455f7d6f691617299e881154ff8185a9d46
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
3cebf9c466
Prepare post 3.3.0RC1 builds
...
Change-Id: I0d808f8733a490b75bbcaacedb4b095e05fab32e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
8bf45c23df
JGit v3.3.0.201402191814-rc1
...
Change-Id: Ida3a0417ae646ce37214153f49a85de2be3dd4fd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
f839d383e6
Prepare post 3.2.0 builds
...
Change-Id: Ie2bfdee0c492e3d61d92acb04c5bef641f5f132f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
699900c308
JGit v3.2.0.201312181205-r
...
Change-Id: Id00a8baf7d3ffefb210f03cd99f69d55411166fe
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
b14a939718
Prepare 3.3.0-SNAPSHOT builds
...
Change-Id: I7c7e7c1beec0c5d15b96c14c73ce93e3f09855c8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Shawn Pearce
d54d19740a
Move SampleDataRepositoryTestCase to org.eclipse.jgit.test
...
This class requires resources which are private to another
bundle. Move the class next to its resources, removing an
odd cross bundle dependency.
Change-Id: I30d5568b09ea5fb3bd3bb60b602f149c0867f49a
11 years ago
Shawn Pearce
573d36a464
Support running from JARs in JGitTestUtil
...
Buck invokes JUnit tests from compiled JARs, not class directories.
When copying a resource back to the filesystem a jar: style URL is
obtained from the ClassLoader.
Change-Id: I28d702484ec13b0b309b87990da867050e4b5ec6
11 years ago
Matthias Sohn
fceae20181
Prepare post 3.2.0-m3 builds
...
Change-Id: I6ef4aa758a6a5d465d4c460178ca3050b8a30449
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
11ad807f7a
JGit v3.2.0.201311130903-m3
...
Change-Id: Icca089f4a60cc94123dc8bf61f7f76f501e08c4d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
e649287502
Enhance RepositoryTestCase.commitFile() to work on empty repository
...
Change-Id: Ic64497f0eedf8996ba593ca52dc9a040732a5b24
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Robin Stocker
09711a4bb9
Make sure SystemReader is reset after test is run
...
Otherwise the MockSystemReader from the test setup is active for other
tests.
Change-Id: I7caf693bd692d06936e29efd4dc4aabb48c1c39b
Signed-off-by: Robin Stocker <robin@nibor.org>
11 years ago
Robin Rosenberg
068e2df1ce
Fix failed tests when the tmp directory is a symlink
...
On Mac OS X /tmp is by default a symbolic link.
Change-Id: I0913ee5ee8db5c5918a9e41abbbfe125b6c70783
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
7995d87713
Prepare 3.2.0-SNAPSHOT builds
...
Change-Id: Iac6cf7a5bb6146ee3fe38abe8020fc3fc4217584
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
da6e87bc37
Prepare post 3.1.0 builds
...
Change-Id: I306a3d40c6ddb88a16d17f09a60e3d19b0716962
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
16ca725b35
JGit v3.1.0.201310021548-r
...
Change-Id: I2170b13047d5eab7565f47f9feb1680e03b1ba09
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
5a2a2222ef
Prepare post 3.1.0 RC1 builds
...
Change-Id: I060f2082ccd0c91905b6b29a49cc633a0b51a1f2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
6f0681eb9f
JGit v3.1.0.201309270735-rc1
...
Change-Id: I48202dd461110da25f9bc159c938311fff0669e0
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
85fae93539
JGit v3.0.3.201309161630-r
...
Change-Id: I73ff609ba681500394b5919f62cff9ec24a52756
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
3af38b4fee
Prepare post 3.0.2 builds
...
Change-Id: Ie1bd951a2cb35d069c94dab4a62507115913764f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
da3041ae73
JGit v3.0.2.201311090911-r
...
Change-Id: Ifaae2e3e2f1bb0504bf9e6d59983086ac19a540b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
4eefa881b3
Prepare post 3.0.2-rc2 builds
...
Change-Id: I0e4020326c6443ba7157c18b345160cf9e1e88a7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago