| Sun, 30 Nov 2014 19:36:03 +0100 |
Mads Kiilerich |
tests: test coverage of parent order with p1 outside rebase set
|
| Sun, 30 Nov 2014 19:35:54 +0100 |
Mads Kiilerich |
tests: add test for rebasing merges with ancestors of the rebase destination
|
| Sun, 30 Nov 2014 19:26:53 +0100 |
Mads Kiilerich |
merge: 0 is a valid ancestor different from None
|
| Thu, 27 Nov 2014 12:25:01 -0600 |
Matt Mackall |
merge with stable
|
| Tue, 25 Nov 2014 19:40:54 -0800 |
Pierre-Yves David |
revert: look for copy information for all local modifications
stable
|
| Mon, 24 Nov 2014 18:42:56 -0800 |
Pierre-Yves David |
rename: properly report removed and added file as modified (issue4458)
stable
|
| Wed, 26 Nov 2014 14:54:16 -0800 |
Pierre-Yves David |
manifest: fix a bug where working copy file 'add' mark was buggy
stable
|
| Wed, 26 Nov 2014 17:22:09 +0300 |
anatoly techtonik |
merge: be precise about what merged into what in short desc
stable
|
| Tue, 11 Nov 2014 20:32:10 -0800 |
Gregory Szorc |
docker: add Docker files for running an Apache mod_wsgi server
|
| Mon, 24 Nov 2014 16:17:02 -0800 |
Martin von Zweigbergk |
merge: use None as filename for base in 'both created' conflicts
|
| Mon, 24 Nov 2014 16:42:36 -0800 |
Martin von Zweigbergk |
merge: break out "both renamed a -> b" case
|
| Mon, 24 Nov 2014 16:16:34 -0800 |
Martin von Zweigbergk |
merge: separate out "both created" cases
|
| Mon, 24 Nov 2014 16:11:22 -0800 |
Martin von Zweigbergk |
merge: indent to prepare for next patch
|
| Tue, 25 Nov 2014 17:30:05 -0600 |
Matt Mackall |
merge with stable
|
