Merge branch 'master' into notes
Conflicts: SparkleLib/Git/SparkleRepoGit.cs
This commit is contained in:
commit
02ec2faf93
|
@ -564,16 +564,6 @@ namespace SparkleLib {
|
|||
}
|
||||
|
||||
|
||||
public override void CreateInitialChangeSet ()
|
||||
{
|
||||
base.CreateInitialChangeSet ();
|
||||
Add ();
|
||||
|
||||
string message = FormatCommitMessage ();
|
||||
Commit (message);
|
||||
}
|
||||
|
||||
|
||||
public override void AddNote (string revision, string note)
|
||||
{
|
||||
int timestamp = (int) (DateTime.UtcNow - new DateTime (1970, 1, 1)).TotalSeconds;
|
||||
|
|
|
@ -86,12 +86,11 @@ namespace SparkleLib {
|
|||
this.status = status;
|
||||
};
|
||||
|
||||
if (CurrentRevision == null) {
|
||||
CreateInitialChangeSet ();
|
||||
HasUnsyncedChanges = true;
|
||||
}
|
||||
|
||||
CreateWatcher ();
|
||||
|
||||
if (CurrentRevision == null)
|
||||
CreateInitialChangeSet ();
|
||||
|
||||
CreateListener ();
|
||||
|
||||
this.local_timer.Elapsed += delegate (object o, ElapsedEventArgs args) {
|
||||
|
|
|
@ -899,6 +899,9 @@ namespace SparkleShare {
|
|||
|
||||
public void FetchFolder (string server, string remote_folder)
|
||||
{
|
||||
server = server.Trim ();
|
||||
remote_folder = remote_folder.Trim ();
|
||||
|
||||
if (!Directory.Exists (SparklePaths.SparkleTmpPath))
|
||||
Directory.CreateDirectory (SparklePaths.SparkleTmpPath);
|
||||
|
||||
|
|
Loading…
Reference in a new issue