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