Mercurial > hg
graph
-
localrepo: omit ".hgsubstate" also from "added" filesSat, 22 Mar 2014 23:39:51 +0900, by FUJIWARA Katsunori
-
dispatch: only do __import__(debugger) when a debugger is requested stableFri, 07 Mar 2014 14:06:52 -0500, by Jordi Gutiérrez Hermoso
-
hg: use "os.path.join()" to join path components which may be empty (issue4203) stableTue, 25 Mar 2014 19:34:17 +0900, by FUJIWARA Katsunori
-
revset: document the regular expression support for tag(name) stableMon, 24 Mar 2014 21:27:40 -0400, by Matt Harbison
-
help: allow -k to find debug commandsSat, 22 Mar 2014 14:46:55 -0500, by Matt Mackall
-
help: let 'hg help debug' show the list of secret debug commandsSat, 15 Mar 2014 16:14:04 +0100, by Mads Kiilerich
-
tests: add run-tests --changed option for running tests changed in revisionsFri, 28 Feb 2014 02:09:00 +0100, by Mads Kiilerich
-
repo: rephrase the "missing requirement" error messageWed, 19 Mar 2014 00:18:30 +0100, by Mads Kiilerich
-
revpair: drop useless conditionalThu, 20 Mar 2014 17:34:02 -0700, by Pierre-Yves David
-
merge with stableFri, 21 Mar 2014 17:20:56 -0500, by Matt Mackall
-
subrepo: add trailing newlines to warnings stableThu, 20 Mar 2014 19:39:05 -0700, by Siddharth Agarwal
-
subrepo: convert matched string to integer before comparing Git version stableThu, 20 Mar 2014 19:38:17 -0700, by Siddharth Agarwal
-
subrepo: only retrieve the first two components of the Git version stableThu, 20 Mar 2014 19:37:01 -0700, by Siddharth Agarwal
-
bundle2: force the first char of parameter to be an letter.Tue, 18 Mar 2014 18:56:08 -0700, by Pierre-Yves David
-
bundle2: refuse empty parameter nameTue, 18 Mar 2014 18:40:31 -0700, by Pierre-Yves David
-
bundle2: urlunquote stream parameter name and value during unbundlingTue, 18 Mar 2014 17:43:08 -0700, by Pierre-Yves David
-
bundle2: urlquote stream parameter name and valueTue, 18 Mar 2014 17:38:11 -0700, by Pierre-Yves David
-
bundle2: support for unbundling parameter valueTue, 18 Mar 2014 16:12:33 -0700, by Pierre-Yves David
-
bundle2: support for bundling parameter valueTue, 18 Mar 2014 16:05:06 -0700, by Pierre-Yves David
-
bundle2: clarify stream parameter design in the documentationThu, 20 Mar 2014 13:18:34 -0700, by Pierre-Yves David
-
repoview: add non-global tags to candidate list for blocking hidden changesetsTue, 18 Mar 2014 20:10:33 -0500, by Sean Farley
-
histedit: select the lowest rev when looking for a root in a revset (bc)Thu, 13 Mar 2014 16:05:06 -0700, by David Soria Parra
-
bundle2: support for unbundling simple parameterTue, 18 Mar 2014 15:56:24 -0700, by Pierre-Yves David
-
bundle2: support bundling simple parameterWed, 19 Mar 2014 14:52:03 -0700, by Pierre-Yves David
-
bundle2: make sure the unbundler refuse non bundle2 streamTue, 18 Mar 2014 16:35:34 -0700, by Pierre-Yves David
-
bundle2: a very first version of bundle2 unbundlerTue, 18 Mar 2014 14:28:42 -0700, by Pierre-Yves David
-
bundle2: very first version of a bundle2 bundlerTue, 18 Mar 2014 14:00:50 -0700, by Pierre-Yves David
-
clone: abort if default destination has no meaningful name (BC)Sat, 22 Mar 2014 00:46:12 +0900, by Yuya Nishihara
-
clone: add doctest for default destinationSat, 22 Mar 2014 00:46:08 +0900, by Yuya Nishihara
-
scmutil: fix revrange when multiple revs are specifiedThu, 20 Mar 2014 09:55:44 -0700, by Durham Goode
-
parsers: fix compiler errors on MSVC 2008Thu, 20 Mar 2014 00:01:59 -0400, by Matt Harbison
-
check-code: check for argument passing py2.6ismWed, 19 Mar 2014 18:04:03 -0500, by Matt Mackall
-
merge with stableWed, 19 Mar 2014 16:21:53 -0500, by Matt Mackall
-
sshpeer: only print out 'running ssh' messages in debug mode (BC)Tue, 18 Mar 2014 13:40:03 -0700, by Siddharth Agarwal
-
tests: small refactoring of run-tests' handling of tests listWed, 19 Mar 2014 00:19:54 +0100, by Mads Kiilerich
-
merge: mark mergestate as dirty when resolve changes _stateFri, 28 Feb 2014 02:26:03 +0100, by Mads Kiilerich
-
backout: improve confusing 'cannot backout change on a different branch' abortMon, 24 Feb 2014 22:42:14 +0100, by Mads Kiilerich
-
config: set a 'source' in most cases where config don't come from file but codeWed, 19 Mar 2014 02:45:14 +0100, by Mads Kiilerich
-
config: don't set source when no source is specified - don't overwrite with ''Wed, 19 Mar 2014 02:45:14 +0100, by Mads Kiilerich
-
config: give a useful hint of source for the most common command line settingsWed, 19 Mar 2014 02:45:04 +0100, by Mads Kiilerich
-
config: backout 77f1f206e135 - 743daa601445 removed the only use of overlayWed, 19 Mar 2014 01:59:15 +0100, by Mads Kiilerich
-
mq: omit ".hgsubstate" from qnew/qrefresh target list for consistent node hashThu, 20 Mar 2014 00:10:45 +0900, by FUJIWARA Katsunori
-
qnew: omit meaningless and harmful putting subrepositories into target listThu, 20 Mar 2014 00:10:45 +0900, by FUJIWARA Katsunori
-
convert: more clear documentation of the 'include' default of a 'include .' stableWed, 19 Mar 2014 00:19:54 +0100, by Mads Kiilerich
-
config: mention edit options and config topic in helpTue, 18 Mar 2014 18:57:19 -0500, by Matt Mackall
-
config: add --global and --local flagsTue, 18 Mar 2014 18:49:30 -0500, by Matt Mackall
-
revrange: pass repo to revset parserTue, 18 Mar 2014 17:56:27 -0500, by Matt Mackall
-
revset: try to handle hyphenated symbols if lookup callback is availableTue, 18 Mar 2014 17:54:42 -0500, by Matt Mackall
-
revset: pass a lookup function to the tokenizerTue, 18 Mar 2014 17:19:44 -0500, by Matt Mackall
-
parser: allow passing a lookup function to a tokenizerTue, 18 Mar 2014 17:17:23 -0500, by Matt Mackall
-
benchmark-revset: add full version of benchmarked revsetSat, 15 Mar 2014 18:11:51 -0700, by Pierre-Yves David
-
localrepo: rename capability set to lower case.Fri, 14 Mar 2014 00:02:05 -0700, by Pierre-Yves David
-
wireproto: move wireproto capabilities computation in a subfunctionWed, 12 Mar 2014 14:46:41 -0700, by Pierre-Yves David
-
wireproto: extract capabilities list in outside the wireproto functionTue, 11 Mar 2014 01:38:02 -0700, by Pierre-Yves David
-
merge with stableTue, 18 Mar 2014 14:25:28 -0500, by Matt Mackall
-
commit: propagate --secret option to subrepos (issue4182) stableMon, 17 Mar 2014 14:57:13 -0400, by Jordi Gutiérrez Hermoso
-
amend: save commit message into ".hg/last-message.txt" stableWed, 19 Mar 2014 01:07:41 +0900, by FUJIWARA Katsunori
-
histedit: save manually edited commit message into ".hg/last-message.txt" stableWed, 19 Mar 2014 01:07:41 +0900, by FUJIWARA Katsunori
-
qfold: save manually edited commit message into ".hg/last-message.txt" stableWed, 19 Mar 2014 01:07:41 +0900, by FUJIWARA Katsunori
-
qnew: save manually edited commit message into ".hg/last-message.txt" stableWed, 19 Mar 2014 01:07:41 +0900, by FUJIWARA Katsunori
-
tag: save manually edited commit message into ".hg/last-message.txt" stableWed, 19 Mar 2014 01:07:41 +0900, by FUJIWARA Katsunori
-
rebase: use "commitforceeditor" instead of "ui.edit()" for "--collapse" stableWed, 19 Mar 2014 01:07:41 +0900, by FUJIWARA Katsunori
-
localrepo: save manually edited commit message as soon as possible stableWed, 19 Mar 2014 01:07:41 +0900, by FUJIWARA Katsunori
-
hgk: enable selected patch text on WindowsSat, 15 Mar 2014 15:44:51 +0100, by Andrew Shadura
-
hgk: ignore ctrl-z as EOF on windowsSat, 15 Mar 2014 15:33:50 +0100, by Andrew Shadura
-
graphmod: changed code in dagwalker to use lazy implementationsFri, 14 Mar 2014 08:46:46 -0700, by Lucas Moscovicz
-
webcommands: changed code to use lazy classes when calling dagwalkerFri, 14 Mar 2014 08:47:57 -0700, by Lucas Moscovicz
-
cmdutil: changed max method for lazy callFri, 14 Mar 2014 13:27:12 -0700, by Lucas Moscovicz
-
getgraphlogrevs: return an empty baseset instead of a empty listFri, 14 Mar 2014 13:26:40 -0700, by Lucas Moscovicz
-
getgraphlogrevs: do not convert smartset to basesetFri, 14 Mar 2014 16:26:50 -0700, by Pierre-Yves David
-
cmdutil: changed revset for spansetFri, 14 Mar 2014 08:44:52 -0700, by Lucas Moscovicz
-
cmdutil: changed code in _makegraphlogrevset not to use getitemFri, 14 Mar 2014 11:35:17 -0700, by Lucas Moscovicz
-
cmdutil: changed code in getgraphlogrevs not to use getitemFri, 14 Mar 2014 08:43:52 -0700, by Lucas Moscovicz
-
revset: changed minrev and maxrev implementations to use ordered setsTue, 18 Feb 2014 11:35:03 -0800, by Lucas Moscovicz
-
revset: changed addset to extend _orderedsetmixinFri, 14 Mar 2014 14:43:44 -0700, by Lucas Moscovicz
-
revset: add a default argument for baseset.__init__Fri, 14 Mar 2014 11:41:26 -0700, by Pierre-Yves David
-
revset: changed orderedlazyset to also extend _orderedsetmixinThu, 13 Mar 2014 11:36:45 -0700, by Lucas Moscovicz
-
revset: changed spanset to extend _orderedsetmixinThu, 13 Mar 2014 11:36:11 -0700, by Lucas Moscovicz
-
revset: added _orderedsetmixin classWed, 12 Mar 2014 16:40:18 -0700, by Lucas Moscovicz
-
revset: added min and max methods to baseset and lazysetWed, 19 Feb 2014 09:28:17 -0800, by Lucas Moscovicz
-
contrib: make revset benchmark script able to read from stdinFri, 14 Mar 2014 15:47:29 -0700, by Pierre-Yves David
-
contrib: have the revset benchmark test script take a revsetFri, 14 Mar 2014 15:43:55 -0700, by Pierre-Yves David
-
contrib: added revset performance benchmarking scriptFri, 14 Mar 2014 11:24:59 -0700, by Lucas Moscovicz
-
contrib: added revset examples for benchmarking performanceFri, 14 Mar 2014 15:00:15 -0700, by Lucas Moscovicz
-
help: filter out deprecated options with untranslated descriptionsMon, 17 Feb 2014 07:39:53 +0100, by Simon Heimberg
-
parsers: fail fast if Python has wrong minor version (issue4110)Wed, 04 Dec 2013 20:38:27 -0800, by Chris Jerdonek
-
debuginstall: change showing to checking for consistency and future checkingFri, 14 Mar 2014 16:00:11 -0500, by Matt Mackall
-
debuginstall: add Python information to debuginstall output (issue4128)Tue, 31 Dec 2013 00:37:16 -0800, by Chris Jerdonek
-
revset: add documentation and comment for _generatorsetFri, 14 Mar 2014 10:57:04 -0700, by Pierre-Yves David
-
revset: add some documentation for lazysetFri, 14 Mar 2014 10:55:03 -0700, by Pierre-Yves David
-
revset: added documentation and comment for spanset classFri, 14 Mar 2014 10:59:51 -0700, by Lucas Moscovicz
-
revset: extend sorting testsTue, 11 Mar 2014 17:25:53 -0700, by Lucas Moscovicz
-
merge with crewFri, 14 Mar 2014 13:12:45 -0500, by Matt Mackall
-
revset: changed smartset methods to return ordered addsetsTue, 11 Mar 2014 17:25:53 -0700, by Lucas Moscovicz
-
revset: added isascending and isdescending methods to _addsetFri, 14 Mar 2014 10:24:09 -0700, by Lucas Moscovicz
-
revset: added __add__ method to _addsetFri, 14 Mar 2014 10:23:54 -0700, by Lucas Moscovicz
-
revset: added __sub__ mehtod to _addsetFri, 14 Mar 2014 10:22:51 -0700, by Lucas Moscovicz
-
revset: added __and__ method to _addsetFri, 14 Mar 2014 10:22:29 -0700, by Lucas Moscovicz
-
revset: added ascending and descending methods to _addsetFri, 14 Mar 2014 10:21:56 -0700, by Lucas Moscovicz
-
revset: added filter method to _addsetThu, 13 Mar 2014 19:12:36 -0700, by Lucas Moscovicz
-
revset: added comments to all methods needed to duck-type from basesetFri, 14 Mar 2014 09:18:14 -0700, by Lucas Moscovicz
-
revset: use more explicit argument names for baseset methodsFri, 14 Mar 2014 10:10:18 -0700, by Lucas Moscovicz
-
revset: added isascending and isdescending methods to smartset classesTue, 11 Mar 2014 17:09:23 -0700, by Lucas Moscovicz
-
revset: added sort method in addsetTue, 11 Mar 2014 17:03:43 -0700, by Lucas Moscovicz
-
revset: added reverse method to addsetThu, 13 Mar 2014 18:57:30 -0700, by Lucas Moscovicz
-
revset: changed _iterator() method on addset to work with a given orderThu, 13 Mar 2014 13:29:04 -0700, by Lucas Moscovicz
-
revset: changed _iterator() in addset to use the generated list when availableThu, 13 Mar 2014 14:51:04 -0700, by Lucas Moscovicz
-
revset: added cached generated list to addsetTue, 11 Mar 2014 16:59:42 -0700, by Lucas Moscovicz
-
revset: changed sort method to use native sort implementation of smartsetsThu, 13 Mar 2014 17:15:21 -0700, by Lucas Moscovicz
-
revset: fixed sorting issue with spansetThu, 13 Mar 2014 17:16:58 -0700, by Lucas Moscovicz
-
tests: added tests to test sort revsetThu, 13 Mar 2014 17:20:03 -0700, by Lucas Moscovicz
-
revset: added __nonzero__ method to spanset classFri, 14 Mar 2014 09:07:59 -0700, by Lucas Moscovicz
-
require: provide a link to a wiki page in addition of suggesting upgradeSat, 25 Jun 2011 02:46:23 +0200, by Pierre-Yves David
-
revset: optimized sort method in lazyset classThu, 06 Mar 2014 09:41:47 -0800, by Lucas Moscovicz
-
revset: improve head revset performanceThu, 13 Mar 2014 13:47:21 -0700, by Durham Goode
-
revset: added ascending attribute to addset classTue, 11 Mar 2014 16:52:15 -0700, by Lucas Moscovicz
-
revset: added set method to addset to duck type generatorsetMon, 10 Mar 2014 10:49:04 -0700, by Lucas Moscovicz
-
merge with defaultThu, 13 Mar 2014 15:00:34 -0500, by Matt Mackall
-
revsets: backout d04aac468bf4 due to performance regressionsThu, 13 Mar 2014 14:34:32 -0500, by Matt Mackall
-
revset: made addset a private classWed, 12 Mar 2014 17:20:26 -0700, by Lucas Moscovicz
-
revset: made descgeneratorset a private classWed, 12 Mar 2014 17:19:46 -0700, by Lucas Moscovicz
-
revset: made ascgeneratorset a private classWed, 12 Mar 2014 17:18:54 -0700, by Lucas Moscovicz
-
revset: made generatorset a private classWed, 12 Mar 2014 17:07:38 -0700, by Lucas Moscovicz
-
cmdutil: changed walkchangerevs to use spanset instead of basesetWed, 05 Mar 2014 18:49:47 -0800, by Lucas Moscovicz
-
revset: added sort methods to generatorsetsMon, 24 Feb 2014 16:36:17 -0800, by Lucas Moscovicz
-
merge with stableThu, 13 Mar 2014 12:05:08 -0500, by Matt Mackall
-
fix_bytesmod: use the "from mercurial" form of the import to avoid breaking httpclientTue, 04 Feb 2014 18:33:25 -0500, by Augie Fackler
-
commit: create new amend changeset as secret correctly for "--secret" option stableThu, 13 Mar 2014 19:48:41 +0900, by FUJIWARA Katsunori
-
hg log: solves bug regarding hg log -r 0:null (issue4039) stableWed, 12 Mar 2014 10:26:48 +0200, by Cristian Zamfir
-
killdaemons: drop superfluous L suffix from constantMon, 10 Mar 2014 17:52:42 -0400, by Augie Fackler
-
setup.py: fix 2.4 breakage in 77ab0abbWed, 12 Mar 2014 18:28:57 -0400, by Augie Fackler
-
setup: handle more invalid python3 syntaxThu, 19 Sep 2013 15:38:42 -0400, by Augie Fackler
-
revset: changed __add__ methods on lazy sets to return addsets (issue4191)Fri, 07 Mar 2014 14:06:49 -0800, by Lucas Moscovicz
-
revset: added addset class with its basic methodsFri, 07 Mar 2014 13:48:31 -0800, by Lucas Moscovicz
-
revset: changed _children method to use lazy structuresTue, 11 Feb 2014 14:03:43 -0800, by Lucas Moscovicz
-
revset: changed descendants revset to use lazy generatorsMon, 10 Feb 2014 12:26:45 -0800, by Lucas Moscovicz
-
revset: optimized _revancestors method based on order of revisionsFri, 07 Feb 2014 13:44:57 -0800, by Lucas Moscovicz
-
revset: changed ancestors revset to return lazy generatorsFri, 07 Feb 2014 10:32:02 -0800, by Lucas Moscovicz
-
doc: show short description of each commands in generated documentsTue, 11 Mar 2014 14:36:40 +0900, by FUJIWARA Katsunori
-
check-code: disallow use of dict(key=value) constructionWed, 12 Mar 2014 13:31:27 -0400, by Augie Fackler
-
setup.py: move from dict() construction to {} literalsWed, 12 Mar 2014 13:29:29 -0400, by Augie Fackler
-
test-wireproto: move from dict() construction to {} literalsWed, 12 Mar 2014 13:21:30 -0400, by Augie Fackler
-
test-url: move from dict() construction to {} literalsWed, 12 Mar 2014 13:21:17 -0400, by Augie Fackler
-
test-filelog: move from dict() construction to {} literalsWed, 12 Mar 2014 13:21:02 -0400, by Augie Fackler
-
templatekw: move from dict() construction to {} literalsWed, 12 Mar 2014 13:20:42 -0400, by Augie Fackler
-
minirst: move from dict() construction to {} literalsWed, 12 Mar 2014 13:20:24 -0400, by Augie Fackler
-
webutil: move from dict() construction to {} literalsWed, 12 Mar 2014 13:20:04 -0400, by Augie Fackler
-
run-tests: move from dict() construction to {} literalsWed, 12 Mar 2014 13:19:43 -0400, by Augie Fackler
-
util: move from dict() construction to {} literalsWed, 12 Mar 2014 13:19:20 -0400, by Augie Fackler
-
webcommands: move from dict() construction to {} literalsWed, 12 Mar 2014 13:29:07 -0400, by Augie Fackler
-
hgwebdir_mod: move from dict() construction to {} literalsWed, 12 Mar 2014 13:15:37 -0400, by Augie Fackler
-
filemerge: move from dict() construction to {} literalsWed, 12 Mar 2014 13:15:09 -0400, by Augie Fackler
-
changegroup: move from dict() construction to {} literalsWed, 12 Mar 2014 13:14:31 -0400, by Augie Fackler
-
extdiff: move from dict() construction to {} literalsWed, 12 Mar 2014 13:13:42 -0400, by Augie Fackler
-
bugzilla: move from dict() construction to {} literalsWed, 12 Mar 2014 13:13:10 -0400, by Augie Fackler
-
synthrepo: move from dict() construction to {} literalsWed, 12 Mar 2014 13:12:26 -0400, by Augie Fackler
-
wireproto: remove todict() and use {} literals insteadWed, 12 Mar 2014 13:00:51 -0400, by Augie Fackler
-
merge with stableTue, 11 Mar 2014 16:19:08 -0500, by Matt Mackall
-
templater: deprecate --style now that -T existsMon, 10 Mar 2014 15:00:41 -0500, by Matt Mackall
-
templating: make -T much more flexibleSat, 08 Mar 2014 17:38:50 -0600, by Matt Mackall
-
changeset_templater: remove use_template methodSat, 08 Mar 2014 16:14:08 -0600, by Matt Mackall
-
cmdutil: make helper function to process template argsSat, 08 Mar 2014 16:01:58 -0600, by Matt Mackall
-
commands: add -T alternative to --templateSat, 08 Mar 2014 15:27:25 -0600, by Matt Mackall
-
config: clarify and exemplify the user name in the sample config fileFri, 07 Mar 2014 14:29:26 -0500, by Jordi Gutiérrez Hermoso
-
templater: make strings in template expressions be "string-escape"-ed correctly stableMon, 10 Mar 2014 01:01:43 +0900, by FUJIWARA Katsunori
-
templater: apply "stringify()" on sub expression to get string correctly stableMon, 10 Mar 2014 01:01:43 +0900, by FUJIWARA Katsunori
-
templater: avoid recursive evaluation of string literals completely stableMon, 10 Mar 2014 01:01:42 +0900, by FUJIWARA Katsunori
-
status: improve explanation of ' ' statusThu, 06 Mar 2014 17:26:49 -0600, by Matt Mackall
-
revset: changed methods in spanset to return ordered setsTue, 18 Feb 2014 13:07:08 -0800, by Lucas Moscovicz
-
revset: added sort method to orderedlazysetTue, 25 Feb 2014 10:36:23 -0800, by Lucas Moscovicz
-
revset: added order methods to lazyset classesFri, 07 Feb 2014 08:44:18 -0800, by Lucas Moscovicz
-
setdiscovery: document algorithms usedThu, 06 Mar 2014 12:37:28 +0100, by Olle Lundberg
-
doc: gendoc.py creates valid output for option descriptions with newlinesThu, 20 Feb 2014 09:17:22 +0100, by Simon Heimberg
-
minirst: create valid output when table data contains a newlineWed, 19 Feb 2014 17:32:21 +0100, by Simon Heimberg
-
tests: match time by a glob to fix intermittent failures of test-lock-badness.tWed, 05 Mar 2014 14:03:08 +0100, by Simon Heimberg
-
merge: adds documentation to the mergestate classWed, 05 Mar 2014 10:49:43 -0800, by Pierre-Yves David
-
merge: add blank line between mergestate's methodWed, 05 Mar 2014 10:22:43 -0800, by Pierre-Yves David
-
cmdserver: allow to start server without repositoryMon, 03 Mar 2014 23:21:24 +0900, by Yuya Nishihara
-
cmdserver: prepare test for starting server without repositoryMon, 03 Mar 2014 23:11:17 +0900, by Yuya Nishihara
-
histedit: move logic for finding child nodes to new functionThu, 06 Mar 2014 01:24:03 +0100, by Olle Lundberg
-
histedit: clean up lock importsWed, 05 Mar 2014 22:02:45 +0100, by Olle Lundberg
-
localrepo: changed revs to use spanset instead of basesetWed, 05 Mar 2014 17:42:05 -0800, by Lucas Moscovicz
-
extensions: use normpath to allow trailing '\' on Windows (issue4187)Wed, 05 Mar 2014 09:31:05 +0000, by Ed Morley
-
tests: fix unused imports from inotify removal caught by pyflakesTue, 04 Mar 2014 09:56:59 -0600, by Matt Mackall
-
revset: added ordered generatorset classes with __contains__ methodThu, 27 Feb 2014 17:27:03 -0800, by Lucas Moscovicz
-
merge: use the right ancestor when both sides copied the same fileTue, 25 Feb 2014 20:29:46 +0100, by Mads Kiilerich
-
copies: when both sides made the same copy, report it as a copyTue, 25 Feb 2014 20:29:14 +0100, by Mads Kiilerich
-
merge: handle create+delete prompts in calculateupdatesSun, 02 Mar 2014 18:36:02 +0100, by Mads Kiilerich
-
merge: handle acceptremove of create+delete early in manifest mergeFri, 28 Feb 2014 02:26:03 +0100, by Mads Kiilerich
-
largefiles: override calculateupdates instead of manifestmergeSun, 02 Mar 2014 18:30:41 +0100, by Mads Kiilerich
-
tests: add systematic test of merge ancestor calculationTue, 25 Feb 2014 20:28:40 +0100, by Mads Kiilerich
-
tests: add test case for criss cross mergeSun, 02 Mar 2014 18:25:19 +0100, by Mads Kiilerich