| 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
|
| Tue, 18 Nov 2014 21:49:05 -0800 |
Siddharth Agarwal |
transplant: don't honor whitespace and format-changing diffopts
|
changeset |
files
|
| Tue, 18 Nov 2014 21:38:19 -0800 |
Siddharth Agarwal |
hgk: don't honor whitespace and format-changing diffopts
|
changeset |
files
|
| Tue, 18 Nov 2014 17:36:24 -0800 |
Siddharth Agarwal |
patchbomb: don't honor whitespace and format-changing diffopts (BC)
|
changeset |
files
|
| Wed, 26 Nov 2014 11:45:21 -0800 |
Martin von Zweigbergk |
merge: add more thorough tests for --force
|
changeset |
files
|
| Wed, 26 Nov 2014 10:25:27 -0800 |
Martin von Zweigbergk |
merge: display modify/delete conflict prompts in sorted order
|
changeset |
files
|
| Sun, 09 Nov 2014 00:10:29 -0800 |
Martin von Zweigbergk |
generate-working-copy-states: accept depth arguments on command line
|
changeset |
files
|
| Sat, 08 Nov 2014 23:37:54 -0800 |
Martin von Zweigbergk |
generate-working-copy-states: generalize for depth
|
changeset |
files
|
| Sat, 29 Nov 2014 14:39:33 -0800 |
Martin von Zweigbergk |
generate-working-copy-states: make 'tracked' a string
|
changeset |
files
|
| Tue, 02 Dec 2014 13:28:07 -0800 |
Martin von Zweigbergk |
merge: demonstrate that directory renames can lose local file content
|
changeset |
files
|
| Fri, 28 Nov 2014 03:09:19 +0100 |
Mads Kiilerich |
mq: drop updateheader - inserthgheader and insertplainheader is enough
|
changeset |
files
|
| Fri, 28 Nov 2014 03:09:06 +0100 |
Mads Kiilerich |
mq: smarter handling of plain headers
|
changeset |
files
|
| Sun, 30 Nov 2014 23:30:31 -0500 |
Matt Harbison |
largefiles: drop the override for 'fetch'
|
changeset |
files
|
| Tue, 02 Dec 2014 11:06:38 -0800 |
Pierre-Yves David |
rebase: ignore negative state when updating back to original wc parent
stable
|
changeset |
files
|
| Fri, 21 Nov 2014 15:50:38 -0800 |
Eric Sumner |
bundle2-push: provide transaction to reply unbundler
|
changeset |
files
|
| Mon, 24 Nov 2014 16:04:44 -0800 |
Eric Sumner |
bundle2.processbundle: let callers request default behavior
|
changeset |
files
|
| Fri, 21 Nov 2014 15:06:38 -0800 |
Eric Sumner |
push: elevate phase transaction to cover entire operation
|
changeset |
files
|
| Fri, 21 Nov 2014 14:32:57 -0800 |
Eric Sumner |
pull: extract transaction logic into separate object
|
changeset |
files
|
| Tue, 18 Nov 2014 20:00:37 -0800 |
Siddharth Agarwal |
record: don't honor format-changing diffopts (issue4459)
|
changeset |
files
|
| Tue, 18 Nov 2014 17:22:03 -0800 |
Siddharth Agarwal |
patch.difffeatureopts: add a feature for format-changing diffopts
|
changeset |
files
|
| Tue, 18 Nov 2014 17:09:26 -0800 |
Siddharth Agarwal |
patch.difffeatureopts: add a feature for whitespace diffopts
|
changeset |
files
|
| Tue, 18 Nov 2014 17:10:14 -0800 |
Siddharth Agarwal |
patch.difffeatureopts: add a feature for diff.git
|
changeset |
files
|
| Tue, 18 Nov 2014 21:43:38 -0800 |
Siddharth Agarwal |
patch: rename diffopts to diffallopts
|
changeset |
files
|
| Tue, 18 Nov 2014 16:53:22 -0800 |
Siddharth Agarwal |
patch: add a new function to initialize diffopts by feature
|
changeset |
files
|
| Tue, 18 Nov 2014 16:00:54 -0800 |
Siddharth Agarwal |
patch.diffopts: use a dict for initialization
|
changeset |
files
|
| Fri, 21 Nov 2014 22:24:45 -0500 |
Matt Harbison |
largefiles: split the creation of a normal matcher out of its install method
|
changeset |
files
|
| Mon, 01 Dec 2014 21:48:32 -0800 |
Martin von Zweigbergk |
addremove: print relative paths when called with -I/-X (BC)
|
changeset |
files
|
| Mon, 01 Dec 2014 19:34:11 -0600 |
Matt Mackall |
merge with stable
|
changeset |
files
|
| Mon, 01 Dec 2014 18:51:10 -0600 |
Matt Mackall |
merge with i18n
stable
|
changeset |
files
|
| Mon, 01 Dec 2014 11:21:30 -0200 |
Wagner Bruna |
i18n-pt_BR: synchronized with 3bd577a3283e
stable
|
changeset |
files
|
| Sat, 29 Nov 2014 14:32:12 +0900 |
FUJIWARA Katsunori |
i18n-ja: synchronized with edf29f9c15f0
stable
|
changeset |
files
|
| Mon, 01 Dec 2014 18:39:19 -0600 |
Matt Mackall |
Added signature for changeset 902554884335
stable
|
changeset |
files
|
| Mon, 01 Dec 2014 18:39:14 -0600 |
Matt Mackall |
Added tag 3.2.2 for changeset 902554884335
stable
|
changeset |
files
|
| Mon, 01 Dec 2014 02:30:21 +0100 |
Mads Kiilerich |
merge: before cd/dc prompt, check that changed side really changed
stable 3.2.2
|
changeset |
files
|
| Mon, 01 Dec 2014 02:11:29 +0100 |
Mads Kiilerich |
largefiles: don't show largefile/normal prompts if one side is unchanged
stable
|
changeset |
files
|
| Mon, 01 Dec 2014 02:11:17 +0100 |
Mads Kiilerich |
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
stable
|
changeset |
files
|
| Mon, 01 Dec 2014 02:10:57 +0100 |
Mads Kiilerich |
tests: clean-up of largefiles tests in test-issue3084.t
stable
|
changeset |
files
|
| Sat, 29 Nov 2014 19:17:47 -0800 |
Pierre-Yves David |
pushkey: gracefully handle prepushkey hook failure (issue4455)
stable
|
changeset |
files
|