 Jakob Borg
|
37f866b47f
|
Use pause/resume device to ensure TestConflictsDefault can run
|
2015-11-17 13:32:57 +01:00 |
|
|
Jakob Borg
|
7705a6c1f1
|
mv internal lib
|
2015-08-09 09:35:26 +02:00 |
|
|
Jakob Borg
|
da4ebb6535
|
Determine conflict winner based on change type and modification time (fixes #1848)
|
2015-07-21 15:39:20 +02:00 |
|
|
Jakob Borg
|
c3d07d60ca
|
Refactored integration tests
Added internal/rc to remote control a Syncthing process and made the
"awaiting sync" determination reliable.
|
2015-06-19 08:47:47 +02:00 |
|
|
Jakob Borg
|
9463192224
|
Refactor integration tests to be a little cleaner and more stable, I hope
|
2015-05-23 23:26:23 +02:00 |
|
 Audrius Butkevicius
|
50d377d9fe
|
Fix integration tests
|
2015-04-28 00:09:44 +01:00 |
|
|
Audrius Butkevicius
|
d12db3e7b8
|
Add osutil.Glob to deal with Windows (fixes #1690)
|
2015-04-26 16:37:50 +01:00 |
|
|
Jakob Borg
|
f45865606a
|
Add initial merge and reset conflict tests
|
2015-04-09 13:06:09 +02:00 |
|
|
Jakob Borg
|
54752deaa1
|
Move index to index-v0.11.0.db (new format) and centralize location config
|
2015-04-01 11:30:28 +02:00 |
|
|
Jakob Borg
|
47e64ae503
|
Handle conflicts when pulling (fixes #220)
|
2015-03-30 00:01:52 +02:00 |
|