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