Mercurial: revision graph

graph

less more | rev 26621: (0) -10000 -3000 -1000 -120 +120 +1000 +3000 +10000 tip

resolve: perform all premerges before performing any file merges (BC)
Sun, 11 Oct 2015 23:58:07 -0700, by Siddharth Agarwal
test-resolve.t: add some tests for .orig file contents
Sun, 11 Oct 2015 23:56:44 -0700, by Siddharth Agarwal
test-resolve.t: add some output to show order of operations
Sun, 11 Oct 2015 23:54:40 -0700, by Siddharth Agarwal
merge.mergestate: perform all premerges before any merges (BC)
Sun, 11 Oct 2015 21:56:39 -0700, by Siddharth Agarwal
merge: introduce a preresolve function
Sun, 11 Oct 2015 20:12:12 -0700, by Siddharth Agarwal
merge.mergestate._resolve: also return completed status
Sun, 11 Oct 2015 18:37:54 -0700, by Siddharth Agarwal
merge.mergestate: add a wrapper around resolve
Sun, 11 Oct 2015 18:29:50 -0700, by Siddharth Agarwal
simplemerge: move conflict warning message to filemerge
Fri, 09 Oct 2015 13:54:52 -0700, by Siddharth Agarwal
filemerge: clean up some dead code
Sun, 11 Oct 2015 15:04:00 -0700, by Siddharth Agarwal
run-tests: add b-prefix on two strings to fix python3 support
Mon, 12 Oct 2015 14:15:04 -0400, by Augie Fackler
filemerge: break overall filemerge into separate premerge and merge steps
Sun, 11 Oct 2015 20:47:14 -0700, by Siddharth Agarwal
filemerge: only copy to backup during premerge step
Sun, 11 Oct 2015 20:04:40 -0700, by Siddharth Agarwal
filemerge: only print out "merging f" output at premerge step
Sun, 11 Oct 2015 20:02:53 -0700, by Siddharth Agarwal
filemerge: deindent the parts of filemerge outside the try block
Thu, 08 Oct 2015 00:19:20 -0700, by Siddharth Agarwal
filemerge: introduce a premerge flag and function
Sun, 11 Oct 2015 20:47:04 -0700, by Siddharth Agarwal
filemerge: also return whether the merge is complete
Sun, 11 Oct 2015 12:56:21 -0700, by Siddharth Agarwal
filemerge: add a wrapper around the filemerge function
Sun, 11 Oct 2015 12:31:08 -0700, by Siddharth Agarwal
context: don't hex encode all unknown 20 char revision specs (issue4890)
Fri, 09 Oct 2015 01:19:37 +0200, by Mads Kiilerich
discovery: put trivial branch first
Mon, 12 Oct 2015 00:45:24 -0700, by Pierre-Yves David
shelve: rename 'publicancestors' to something accurate (issue4737)
Fri, 09 Oct 2015 15:31:50 -0700, by Pierre-Yves David
makefile: add wheel build target
Fri, 09 Oct 2015 12:30:46 -0500, by Nathan Goldbaum
setup: import setup from setuptools if FORCE_SETUPTOOLS is set
Fri, 09 Oct 2015 12:25:51 -0500, by Nathan Goldbaum
hgweb: remove obsolete -webkit-border-radius property
Mon, 12 Oct 2015 14:46:51 +0100, by Gijs Kruitbosch
monoblue: add a link to the latest file revision
Mon, 12 Oct 2015 15:20:04 +0800, by Anton Shestakov
discovery: reference relevant bug in the faulty code
Fri, 09 Oct 2015 15:44:00 -0700, by Pierre-Yves David
discovery: fix a typo in a comment
Fri, 09 Oct 2015 15:37:05 -0700, by Pierre-Yves David
getsubset: get the unpacker version from the bundler
Fri, 09 Oct 2015 14:59:37 -0700, by Pierre-Yves David
test-convert-cvs: add sleep so cvs notices changes
Mon, 12 Oct 2015 15:42:32 +0300, by Emanuele Giaquinta
cvsps: fix computation of parent revisions when log caching is on
Wed, 07 Oct 2015 11:33:52 +0300, by Emanuele Giaquinta
dirstate: batch calls to statfiles (issue4878)
Tue, 06 Oct 2015 16:26:20 -0500, by Matt Mackall
parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888)
Sun, 11 Oct 2015 18:30:47 +0900, by Yuya Nishihara
parsers: read sizes of metadata pair of obsolete marker at once
Sun, 11 Oct 2015 18:41:41 +0900, by Yuya Nishihara
filemerge: clean up temp files in a finally block
Wed, 07 Oct 2015 21:51:24 -0700, by Siddharth Agarwal
check-code: detect and ban 'util.Abort'
Thu, 08 Oct 2015 12:53:09 -0700, by Pierre-Yves David
error: get Abort from 'error' instead of 'util'
Thu, 08 Oct 2015 12:55:45 -0700, by Pierre-Yves David
eol: rename 'error' to 'haserror'
Mon, 05 Oct 2015 22:49:24 -0700, by Pierre-Yves David
discovery: rename 'error' to 'errormsg'
Mon, 05 Oct 2015 22:29:57 -0700, by Pierre-Yves David
histedit: delete histedit statefile on any exception during abort
Mon, 05 Oct 2015 16:44:45 -0700, by Christian Delahousse
histedit: check presence of statefile before deleting it
Tue, 06 Oct 2015 15:09:28 -0700, by Christian Delahousse
histedit: add inprogress method to state class
Mon, 05 Oct 2015 16:34:17 -0700, by Christian Delahousse
commands: use dirstateguard instead of begin/end-parentchange for backout
Fri, 09 Oct 2015 03:53:47 +0900, by FUJIWARA Katsunori
commands: make "hg import" use dirstateguard only for --no-commit
Fri, 09 Oct 2015 03:53:47 +0900, by FUJIWARA Katsunori
cmdutil: stop tryimportone from using dirstateguard (BC)
Fri, 09 Oct 2015 03:53:46 +0900, by FUJIWARA Katsunori
dirstate: remove meaningless dirstateguard
Fri, 09 Oct 2015 03:53:46 +0900, by FUJIWARA Katsunori
localrepo: execute appropriate actions for dirstate at releasing transaction
Fri, 09 Oct 2015 03:53:46 +0900, by FUJIWARA Katsunori
transaction: add releasefn to notify the end of a transaction scope
Fri, 09 Oct 2015 03:53:46 +0900, by FUJIWARA Katsunori
filemerge: move post-merge checks into a separate function
Wed, 07 Oct 2015 23:35:30 -0700, by Siddharth Agarwal
filemerge._xmerge: drop no longer necessary 'if r:' check
Thu, 08 Oct 2015 14:18:43 -0700, by Siddharth Agarwal
filemerge._idump: drop no longer necessary 'if r:' check
Thu, 08 Oct 2015 14:17:31 -0700, by Siddharth Agarwal
filemerge._merge: drop no longer necessary 'if r:' check
Thu, 08 Oct 2015 14:16:19 -0700, by Siddharth Agarwal
revset: delete _updatedefaultdest as it has no users
Mon, 05 Oct 2015 02:33:45 -0700, by Pierre-Yves David
merge: get the default update destination from the function
Mon, 28 Sep 2015 22:11:23 -0700, by Pierre-Yves David
update: move default destination computation to a function
Mon, 05 Oct 2015 01:46:47 -0700, by Pierre-Yves David
worker: restore old countcpus code (issue4869)
Thu, 08 Oct 2015 10:57:03 -0700, by Gregory Szorc
filemerge: call premerge directly from main merge function
Wed, 07 Oct 2015 21:22:16 -0700, by Siddharth Agarwal
bundle2: allow lazily acquiring the lock
Mon, 05 Oct 2015 16:19:54 -0700, by Durham Goode
bundle2: add op.gettransaction() to handlers that need the lock
Tue, 06 Oct 2015 14:42:29 -0700, by Durham Goode
merge with stable
Thu, 08 Oct 2015 17:44:22 -0500, by Matt Mackall
patchbomb: add a 'bundletype' config under 'patchbomb'
Thu, 01 Oct 2015 23:13:57 -0700, by Pierre-Yves David
import: allow processing of extra part header after import
Wed, 07 Oct 2015 13:05:25 -0700, by Pierre-Yves David
import: allow processing of extra part header during import
Tue, 06 Oct 2015 09:51:24 -0700, by Pierre-Yves David
extract: parse 'nodeid' using the generic mechanism
Tue, 06 Oct 2015 02:23:21 -0700, by Pierre-Yves David
extract: parse 'branch' using the generic mechanism
Tue, 06 Oct 2015 02:22:23 -0700, by Pierre-Yves David
extract: parse 'date' using the generic mechanism
Wed, 07 Oct 2015 01:13:36 -0700, by Pierre-Yves David
extract: add some facility for extensible header parsing
Wed, 07 Oct 2015 01:20:49 -0700, by Pierre-Yves David
extract: remove the 'user' variable
Tue, 06 Oct 2015 02:16:24 -0700, by Pierre-Yves David
extract: use a single return
Tue, 06 Oct 2015 02:11:09 -0700, by Pierre-Yves David
extract: move 'nodeid' assignment where it is parsed
Wed, 07 Oct 2015 00:50:53 -0700, by Pierre-Yves David
extract: move 'date' assignment where it is parsed
Tue, 06 Oct 2015 02:08:32 -0700, by Pierre-Yves David
extract: assign user to 'data' earlier
Tue, 06 Oct 2015 02:07:33 -0700, by Pierre-Yves David
extract: move 'branch' assignment where it is parsed
Tue, 06 Oct 2015 02:06:36 -0700, by Pierre-Yves David
extract: directly assign parent to data dictionary
Tue, 06 Oct 2015 02:05:56 -0700, by Pierre-Yves David
extract: assign message only once
Tue, 06 Oct 2015 02:04:46 -0700, by Pierre-Yves David
extract: simplify parents assignement
Tue, 06 Oct 2015 02:04:06 -0700, by Pierre-Yves David
patch: move 'extract' return to a dictionnary
Tue, 06 Oct 2015 02:01:53 -0700, by Pierre-Yves David
patchbomb: add experimental config of a "pullurl" and export it
Tue, 06 Oct 2015 01:49:04 -0700, by Pierre-Yves David
export: introduce a generic way to add patch header on export
Mon, 05 Oct 2015 23:17:01 -0700, by Pierre-Yves David
incoming: request a bundle2 when possible (BC)
Mon, 05 Oct 2015 00:23:20 -0700, by Pierre-Yves David
bundlerepo: indent some code to prepare next patch
Mon, 05 Oct 2015 00:18:11 -0700, by Pierre-Yves David
bundle2: add a way to just forward the bundle2 stream to another user
Thu, 08 Oct 2015 01:40:21 -0700, by Pierre-Yves David
bundle2: split parameter retrieval and processing
Mon, 05 Oct 2015 01:10:49 -0700, by Pierre-Yves David
changegroup: extract the file management part in its own function
Mon, 05 Oct 2015 00:14:47 -0700, by Pierre-Yves David
unbundle: properly read head modification result from bundle2
Sun, 04 Oct 2015 21:48:19 -0700, by Pierre-Yves David
revset: strip off "literal:" prefix from bookmark not found error
Wed, 07 Oct 2015 23:04:31 +0900, by Yuya Nishihara
revset: do not fall through to revspec for literal: branch (issue4838)
Wed, 07 Oct 2015 23:00:29 +0900, by Yuya Nishihara
hgweb: ensure both foreground and background colors are specified (issue4872)
Wed, 07 Oct 2015 21:08:14 +0100, by Gijs Kruitbosch
templater: do not pre-evaluate generator keyword at runsymbol (issue4868) stable
Thu, 08 Oct 2015 23:24:38 +0900, by Yuya Nishihara
merge: drop special parent assignment in the obsolete case
Mon, 05 Oct 2015 01:47:33 -0700, by Pierre-Yves David
bundle: use bundle2 if repository uses general delta
Thu, 01 Oct 2015 20:31:43 -0700, by Pierre-Yves David
parsebundletype: add a comment for future generation
Thu, 01 Oct 2015 20:21:16 -0700, by Pierre-Yves David
bundle: extend the format of --type to support version and compression
Thu, 01 Oct 2015 19:16:00 -0700, by Pierre-Yves David
hgweb: fix border-radius for standards-based browsers
Wed, 07 Oct 2015 20:19:20 +0100, by Gijs Kruitbosch
filemerge: move precheck to before files are written out
Wed, 07 Oct 2015 21:28:43 -0700, by Siddharth Agarwal
filemerge: move 'merging' output to before file creation
Wed, 07 Oct 2015 22:58:52 -0700, by Siddharth Agarwal
filemerge.filemerge: make a tuple containing merge paths on disk
Wed, 07 Oct 2015 21:21:56 -0700, by Siddharth Agarwal
filemerge: switch trymerge boolean to mergetype enum
Wed, 07 Oct 2015 16:14:57 -0700, by Siddharth Agarwal
filemerge: add some merge types
Wed, 07 Oct 2015 15:13:41 -0700, by Siddharth Agarwal
shelve: restore unshelved dirstate explicitly after aborting transaction
Thu, 08 Oct 2015 01:41:30 +0900, by FUJIWARA Katsunori
shelve: restore shelved dirstate explicitly after aborting transaction
Thu, 08 Oct 2015 01:41:30 +0900, by FUJIWARA Katsunori
shelve: add utility to abort current transaction but keep dirstate
Thu, 08 Oct 2015 01:41:30 +0900, by FUJIWARA Katsunori
dirstate: split write to write changes into files other than .hg/dirstate
Thu, 08 Oct 2015 01:41:30 +0900, by FUJIWARA Katsunori
bookmarks: use recordchange instead of writing if transaction is active
Thu, 08 Oct 2015 01:41:30 +0900, by FUJIWARA Katsunori
filemerge: run symlink check for :merge3
Wed, 07 Oct 2015 00:27:23 -0700, by Siddharth Agarwal
filemerge: print correct name of tool for symlink checks
Wed, 07 Oct 2015 00:24:44 -0700, by Siddharth Agarwal
filemerge: normalize 'internal:foo' names to ':foo'
Wed, 07 Oct 2015 00:01:16 -0700, by Siddharth Agarwal
filemerge: use symlinkcheck for :merge and :union
Tue, 06 Oct 2015 22:57:21 -0700, by Siddharth Agarwal
filemerge: add a precheck for symlinks
Tue, 06 Oct 2015 22:56:33 -0700, by Siddharth Agarwal
filemerge: call precheck if available
Tue, 06 Oct 2015 22:55:21 -0700, by Siddharth Agarwal
filemerge: add a before-merge callback to internal merge tools
Tue, 06 Oct 2015 22:54:14 -0700, by Siddharth Agarwal
filemerge: indent filemerge.filemerge
Tue, 06 Oct 2015 17:39:13 -0700, by Siddharth Agarwal
test-bundle-type: replace unbundle with debugbundle
Thu, 01 Oct 2015 20:15:00 -0700, by Pierre-Yves David
bundle: extract the parsing of the bundle type in a function
Thu, 01 Oct 2015 18:01:24 -0700, by Pierre-Yves David
changegroup: add version argument to getchangegroup
Thu, 01 Oct 2015 19:14:47 -0700, by Pierre-Yves David
changegroup: add version argument to getlocalchangegroup
Thu, 01 Oct 2015 19:14:33 -0700, by Pierre-Yves David
shelve: bundle using bundle2 if repository is general delta (issue4862)
Thu, 01 Oct 2015 15:08:00 -0700, by Pierre-Yves David
shelve: move changegroup generation inside writebundle
Thu, 01 Oct 2015 15:09:32 -0700, by Pierre-Yves David
shelve: compress on-disk bundle
Tue, 29 Sep 2015 17:14:30 -0700, by Pierre-Yves David
merge with stable
Wed, 07 Oct 2015 13:44:48 -0500, by Matt Mackall
notify: fix fromauthor setting for 'incoming' hook type (issue4194) stable
Mon, 05 Oct 2015 10:43:16 -0600, by Bruce Cran
templater: protect word() from crashing on out of range negative value stable
Mon, 05 Oct 2015 12:37:26 -0400, by Matt Harbison

less more | rev 26621: (0) -10000 -3000 -1000 -120 +120 +1000 +3000 +10000 tip

Mercurial > hg

graph