Martin Bornhold
|
1824a54c6d
|
settings: Use the new 'use_rebase' argument to decide between rebase or merge.
|
2016-06-27 13:18:25 +02:00 |
|
Martin Bornhold
|
488bd2df2f
|
settings: Add argument to select rebase as merge strategy.
|
2016-06-27 13:16:10 +02:00 |
|
Daniel Dourvaris
|
bf2e56d06f
|
bugfix: missing import
|
2016-06-09 15:38:48 +03:00 |
|
Johannes Bornhold
|
e756b3e5f4
|
hg: Log original exception when doing the merge with rebase.
|
2016-06-09 12:04:59 +02:00 |
|
Daniel Dourvaris
|
bf510fd33c
|
vcs: make commit datetimes utc
|
2016-06-09 05:20:58 +03:00 |
|
Johannes Bornhold
|
5eae0d6f48
|
hg: Fix up logging message for local push
|
2016-06-09 00:18:56 +02:00 |
|
Johannes Bornhold
|
1b4ce0b7a5
|
hg: Include state of dry_run in merge failure logging.
|
2016-06-08 23:57:08 +02:00 |
|
Johannes Bornhold
|
f42158291f
|
hg: Clean up unused variable
|
2016-06-08 23:50:12 +02:00 |
|
Johannes Bornhold
|
0410a1f483
|
hg: Increase logging around merge status check
|
2016-06-08 23:26:40 +02:00 |
|
Daniel Dourvaris
|
545fe36195
|
bugfix: missing import
|
2016-06-01 16:27:02 +03:00 |
|
Daniel Dourvaris
|
dbb993b0d4
|
logging: log the original error when a merge failure occurs
|
2016-05-31 16:08:21 +03:00 |
|
Marcin Kuzminski
|
9a0d8c0b77
|
project: added all source files and assets
|
2016-05-24 15:56:53 +02:00 |
|