Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | adding svn_resolution to global namespace | Jason Kincl | 2012-11-27 | 1 | -2/+2 |
* | adding svn merge resolution map | Jason Kincl | 2012-11-27 | 1 | -3/+27 |
* | Merge remote branch 'upstream/master' into jasons-hacking | Jason Kincl | 2012-11-27 | 1 | -2/+1 |
|\ | |||||
| * | fixed vcs_root/vcs_path for Version plugins, esp. Svn | Chris St. Pierre | 2012-11-19 | 1 | -2/+1 |
* | | minor typo and function documentation | Jason Kincl | 2012-11-19 | 1 | -2/+3 |
* | | Adding a default conflict resolver of theirs-full to Svn Plugin | Jason Kincl | 2012-11-07 | 1 | -0/+4 |
|/ | |||||
* | added Git.Update RMI, ability to base bcfg2 VCS repo at a different directory... | Chris St. Pierre | 2012-10-30 | 1 | -21/+112 |
* | run pylint for errors on almost everything, full runs on some selected stuff | Chris St. Pierre | 2012-09-25 | 1 | -25/+13 |
* | Allow to run directly from a git checkout (#1037) | Sol Jerome | 2012-03-24 | 1 | -0/+46 |