| Wed, 03 Dec 2014 11:02:52 -0800 |
Martin von Zweigbergk |
merge: don't overwrite conflicting file in locally renamed directory
|
| Wed, 03 Dec 2014 10:56:07 -0800 |
Martin von Zweigbergk |
merge: don't ignore conflicting file in remote renamed directory
|
| Sun, 23 Nov 2014 15:08:50 -0800 |
Martin von Zweigbergk |
merge: duplicate 'if f in copied' into each branch
|
| Sun, 23 Nov 2014 14:09:10 -0800 |
Martin von Zweigbergk |
merge: branch code into {n1 and n2, n1, n2} top-level cases
|
| Tue, 02 Dec 2014 16:39:59 -0800 |
Martin von Zweigbergk |
update: remove redundant and misplaced merge tests
|
| Fri, 21 Nov 2014 13:02:45 -0800 |
Martin von Zweigbergk |
largefiles: use clearer debug messages in actions
|
| Fri, 21 Nov 2014 11:44:57 -0800 |
Martin von Zweigbergk |
largefiles: don't clobber merge action message with user message
|
| Tue, 02 Dec 2014 20:31:19 -0800 |
Ryan McElroy |
bookmarks: factor out repository lookup from writing bookmarks file
|
| Thu, 04 Dec 2014 12:02:02 -0500 |
Mike Edgar |
parsers: ensure revlog index node tree is initialized before insertion
|
| Wed, 03 Dec 2014 22:56:42 +0900 |
Yuya Nishihara |
revset: add 'only' to DoS-safe symbols
|
| Wed, 03 Dec 2014 22:52:54 +0900 |
Yuya Nishihara |
revset: move 'only' so that functions are sorted alphabetically
|
| Tue, 02 Dec 2014 22:42:41 -0500 |
Matt Harbison |
tests: drop unnecessary glob that causes a warning on Windows
|
| Wed, 03 Dec 2014 10:01:24 -0800 |
Martin von Zweigbergk |
merge: add test with conflicting file and remote directory rename
|
| Wed, 03 Dec 2014 15:03:29 -0800 |
Martin von Zweigbergk |
graft: use a real conflict for the tests
|
| Wed, 03 Dec 2014 14:33:29 -0800 |
John Coomes |
add: use lexists so that broken symbolic links are added
|
| Tue, 02 Dec 2014 05:12:59 +0100 |
Mads Kiilerich |
rebase: avoid redundant repo[rev].rev() - just keep working in rev space
|
| Tue, 02 Dec 2014 05:12:59 +0100 |
Mads Kiilerich |
rebase: always store rev in state, also when collapsing
|
| Tue, 02 Dec 2014 05:12:53 +0100 |
Mads Kiilerich |
rebase: clarify naming of variables holding node hashes - don't call them rev
|
| Thu, 27 Nov 2014 00:24:25 -0800 |
Ryan McElroy |
bookmarks: factor out bookmark file opening for easier extensibility
|
| Tue, 02 Dec 2014 17:19:20 -0600 |
Matt Mackall |
merge with stable
|
| Tue, 18 Nov 2014 22:18:05 -0800 |
Siddharth Agarwal |
diff: explicitly honor all diffopts
|
| Tue, 18 Nov 2014 22:16:46 -0800 |
Siddharth Agarwal |
annotate: explicitly only honor whitespace diffopts
|
| Tue, 18 Nov 2014 21:47:47 -0800 |
Siddharth Agarwal |
notify: explicitly honor all diffopts
|
| Tue, 18 Nov 2014 22:13:05 -0800 |
Siddharth Agarwal |
jsonchangeset: don't honor whitespace and format-changing diffopts
|
| Tue, 18 Nov 2014 21:49:05 -0800 |
Siddharth Agarwal |
transplant: don't honor whitespace and format-changing diffopts
|
| Tue, 18 Nov 2014 21:38:19 -0800 |
Siddharth Agarwal |
hgk: don't honor whitespace and format-changing diffopts
|
| Tue, 18 Nov 2014 17:36:24 -0800 |
Siddharth Agarwal |
patchbomb: don't honor whitespace and format-changing diffopts (BC)
|
| Wed, 26 Nov 2014 11:45:21 -0800 |
Martin von Zweigbergk |
merge: add more thorough tests for --force
|
| Wed, 26 Nov 2014 10:25:27 -0800 |
Martin von Zweigbergk |
merge: display modify/delete conflict prompts in sorted order
|
| Sun, 09 Nov 2014 00:10:29 -0800 |
Martin von Zweigbergk |
generate-working-copy-states: accept depth arguments on command line
|
