martin/nci
1
0
Fork 0
mirror of https://gitlab.silvrtree.co.uk/martind2000/nci.git synced 2025-02-11 03:39:15 +00:00
Code Issues Projects Releases Wiki Activity

throw away workspace changes on repository update

Browse Source
This commit is contained in:
oleg 2015-11-22 14:08:24 +03:00
parent 673c2bf2dd
commit 037b79a0c6
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -24,6 +24,7 @@ work in progress...
* ~~Compile client for production~~ * ~~Compile client for production~~
* Semantic versioning and plugins * Semantic versioning and plugins
* ~~Complete uncompleted builds on server start~~ * ~~Complete uncompleted builds on server start~~
* ~~Throw away workspace changes on repository update~~
Ui fixes Ui fixes

2
lib/scm/base.js
View File

@ -52,7 +52,7 @@ Scm.prototype.getRev = function(rev, callback) {
}; };
/** /**
* Updates to revision * Updates to revision and throw away all local changes
*/ */
Scm.prototype.update = function(rev, callback) { Scm.prototype.update = function(rev, callback) {
}; };

2
lib/scm/git.js
View File

@ -154,5 +154,5 @@ Scm.prototype.getChanges = function(rev1, rev2, callback) {
}; };
Scm.prototype.update = function(rev, callback) { Scm.prototype.update = function(rev, callback) {
this.run({cmd: 'git', args: ['checkout', rev]}, callback); this.run({cmd: 'git', args: ['checkout', '-f', rev]}, callback);
}; };

2
lib/scm/mercurial.js
View File

@ -113,5 +113,5 @@ Scm.prototype.getChanges = function(rev1, rev2, callback) {
}; };
Scm.prototype.update = function(rev, callback) { Scm.prototype.update = function(rev, callback) {
this.run({cmd: 'hg', args: ['up', rev]}, callback); this.run({cmd: 'hg', args: ['up', '-C', rev]}, callback);
}; };