mercurial at 27050: 39 new changesets
Mercurial Commits
hg at intevation.org
Fri Nov 20 20:45:32 UTC 2015
39 new changesets in mercurial:
http://selenic.com/repo/hg//rev/5eac7ab59b95
changeset: 27012:5eac7ab59b95
user: Laurent Charignon <lcharignon at fb.com>
date: Wed Nov 18 13:44:29 2015 -0800
summary: rebase: don't rebase obsolete commits with no successor
http://selenic.com/repo/hg//rev/e97132eb841c
changeset: 27013:e97132eb841c
user: Laurent Charignon <lcharignon at fb.com>
date: Wed Nov 18 16:06:00 2015 -0800
summary: rebase: remove an unused todo
http://selenic.com/repo/hg//rev/4223fc58f952
changeset: 27014:4223fc58f952
user: Laurent Charignon <lcharignon at fb.com>
date: Wed Nov 18 15:58:06 2015 -0800
summary: rebase: refactoring to avoid repetition of expression
http://selenic.com/repo/hg//rev/341cb90ffd18
changeset: 27015:341cb90ffd18
user: Matt Mackall <mpm at selenic.com>
date: Thu Nov 19 13:21:24 2015 -0600
summary: util: disable floating point stat times (issue4836)
http://selenic.com/repo/hg//rev/448cbdab5883
changeset: 27016:448cbdab5883
user: Matt Mackall <mpm at selenic.com>
date: Thu Nov 19 13:15:17 2015 -0600
summary: util: drop statmtimesec
http://selenic.com/repo/hg//rev/cdc3e437b481
changeset: 27017:cdc3e437b481
user: Matt Mackall <mpm at selenic.com>
date: Thu Nov 19 15:02:27 2015 -0600
summary: perf: un-bitrot perfstatus
http://selenic.com/repo/hg//rev/e5be48dd8215
changeset: 27018:e5be48dd8215
user: Yuya Nishihara <yuya at tcha.org>
date: Sun Nov 01 13:55:21 2015 +0900
summary: import-checker: allow symbol imports from hgweb.common and .request
http://selenic.com/repo/hg//rev/5cf184398ee7
changeset: 27019:5cf184398ee7
user: Siddharth Agarwal <sid0 at fb.com>
date: Wed Nov 18 15:04:03 2015 -0800
summary: unshelve: add -k as short form of --keep
http://selenic.com/repo/hg//rev/cc2049184ece
changeset: 27020:cc2049184ece
user: Siddharth Agarwal <sid0 at fb.com>
date: Wed Nov 18 15:18:16 2015 -0800
summary: unshelve: shed spurious space
http://selenic.com/repo/hg//rev/f2554154509f
changeset: 27021:f2554154509f
user: Siddharth Agarwal <sid0 at fb.com>
date: Wed Nov 18 15:11:23 2015 -0800
summary: unshelve: add support for custom merge tools
http://selenic.com/repo/hg//rev/35102876d648
changeset: 27022:35102876d648
user: Siddharth Agarwal <sid0 at fb.com>
date: Wed Nov 18 16:39:30 2015 -0800
summary: mergestate: move binary format documentation into _readrecordsv2
http://selenic.com/repo/hg//rev/0c8ef79b9fd7
changeset: 27023:0c8ef79b9fd7
user: Anton Shestakov <av6 at dwimlabs.net>
date: Tue Nov 10 17:22:40 2015 +0800
summary: webutil: make _siblings into an object with __iter__ and __len__
http://selenic.com/repo/hg//rev/ceef5fb14872
changeset: 27024:ceef5fb14872
user: liscju <piotr.listkiewicz at gmail.com>
date: Wed Nov 18 20:55:32 2015 +0100
summary: fileset: add missing() predicate (issue4925)
http://selenic.com/repo/hg//rev/ec37257341a9
changeset: 27025:ec37257341a9
user: Siddharth Agarwal <sid0 at fb.com>
date: Wed Nov 18 23:43:18 2015 -0800
summary: resolve: fix incorrect merge
http://selenic.com/repo/hg//rev/c93b44b79359
changeset: 27026:c93b44b79359
user: Siddharth Agarwal <sid0 at fb.com>
date: Wed Nov 18 23:42:32 2015 -0800
summary: test-resolve.t: remove completely unnecessary line
http://selenic.com/repo/hg//rev/a01ecbcfaf84
changeset: 27027:a01ecbcfaf84
user: Siddharth Agarwal <sid0 at fb.com>
date: Wed Nov 18 15:46:45 2015 -0800
summary: mergestate: handle additional record types specially
http://selenic.com/repo/hg//rev/f92053df8f0b
changeset: 27028:f92053df8f0b
user: Pierre-Yves David <pierre-yves.david at fb.com>
date: Wed Nov 18 23:23:03 2015 -0800
summary: revset: speed up '_matchfiles'
http://selenic.com/repo/hg//rev/8279c5d116a0
changeset: 27029:8279c5d116a0
user: Shubhanshu Agrawal <agrawal.shubhanshu at gmail.com>
date: Sun Nov 15 21:03:44 2015 +0530
summary: strip: strip a list of bookmarks
http://selenic.com/repo/hg//rev/cf9ed6d32ccb
changeset: 27030:cf9ed6d32ccb
user: Shubhanshu Agrawal <agrawal.shubhanshu at gmail.com>
date: Thu Nov 19 12:50:10 2015 +0530
summary: strip: changing bookmark argument to be a list
http://selenic.com/repo/hg//rev/8be0af32e513
changeset: 27031:8be0af32e513
user: Siddharth Agarwal <sid0 at fb.com>
date: Wed Nov 18 15:46:45 2015 -0800
summary: mergestate: allow storing and retrieving change/delete conflicts
http://selenic.com/repo/hg//rev/28ee7af4b685
changeset: 27032:28ee7af4b685
user: Siddharth Agarwal <sid0 at fb.com>
date: Wed Nov 18 13:52:28 2015 -0800
summary: filemerge: return whether the file is deleted for nomerge internal tools
http://selenic.com/repo/hg//rev/089dab8794dc
changeset: 27033:089dab8794dc
user: Siddharth Agarwal <sid0 at fb.com>
date: Wed Nov 18 13:55:31 2015 -0800
summary: filemerge: return whether the file is deleted from all other merge tools
http://selenic.com/repo/hg//rev/86ede9eda252
changeset: 27034:86ede9eda252
user: Siddharth Agarwal <sid0 at fb.com>
date: Wed Nov 18 14:22:52 2015 -0800
summary: filemerge: return whether the file was deleted
http://selenic.com/repo/hg//rev/de7bf242644e
changeset: 27035:de7bf242644e
user: Siddharth Agarwal <sid0 at fb.com>
date: Thu Nov 19 10:50:02 2015 -0800
summary: merge.mergestate: compute dirstate action
http://selenic.com/repo/hg//rev/63d6bc874dea
changeset: 27036:63d6bc874dea
user: Siddharth Agarwal <sid0 at fb.com>
date: Wed Nov 18 15:40:28 2015 -0800
summary: filemerge: add support for change/delete conflicts to the ':local' merge tool
http://selenic.com/repo/hg//rev/a8908c139f2f
changeset: 27037:a8908c139f2f
user: Siddharth Agarwal <sid0 at fb.com>
date: Wed Nov 18 15:41:50 2015 -0800
summary: filemerge: add support for change/delete conflicts to the ':other' merge tool
http://selenic.com/repo/hg//rev/58a4eb16e722
changeset: 27038:58a4eb16e722
user: Siddharth Agarwal <sid0 at fb.com>
date: Fri Nov 13 23:52:26 2015 -0800
summary: filemerge: add support for change/delete conflicts to the ':prompt' tool
http://selenic.com/repo/hg//rev/d7517deedf86
changeset: 27039:d7517deedf86
user: Siddharth Agarwal <sid0 at fb.com>
date: Sun Nov 15 21:40:15 2015 -0800
summary: filemerge._picktool: only pick from nomerge tools for change/delete conflicts
http://selenic.com/repo/hg//rev/1bde66b89bb2
changeset: 27040:1bde66b89bb2
user: Siddharth Agarwal <sid0 at fb.com>
date: Fri Nov 13 23:58:05 2015 -0800
summary: filemerge._mergecheck: add check for change/delete conflicts
http://selenic.com/repo/hg//rev/0e330f59ef68
changeset: 27041:0e330f59ef68
user: Siddharth Agarwal <sid0 at fb.com>
date: Fri Nov 13 23:56:00 2015 -0800
summary: filemerge: don't attempt to premerge change/delete conflicts
http://selenic.com/repo/hg//rev/30b919bc49bf
changeset: 27042:30b919bc49bf
user: Siddharth Agarwal <sid0 at fb.com>
date: Fri Nov 13 23:57:43 2015 -0800
summary: filemerge: don't try using external tools on change/delete conflicts
http://selenic.com/repo/hg//rev/ccdc95c6841e
changeset: 27043:ccdc95c6841e
user: Yuya Nishihara <yuya at tcha.org>
date: Sun Nov 01 14:23:23 2015 +0900
summary: hgweb: do not import hgweb_mod.hgweb and .makebreadcrumb as symbol
http://selenic.com/repo/hg//rev/1dde4914fb6c
changeset: 27044:1dde4914fb6c
user: Yuya Nishihara <yuya at tcha.org>
date: Sun Nov 01 15:07:08 2015 +0900
summary: hgweb: import BaseHTTPServer as module at top level
http://selenic.com/repo/hg//rev/eac72c1e1e0d
changeset: 27045:eac72c1e1e0d
user: Yuya Nishihara <yuya at tcha.org>
date: Sun Nov 01 15:09:35 2015 +0900
summary: hgweb: import wsgicgi at top level
http://selenic.com/repo/hg//rev/37fcfe52c68c
changeset: 27046:37fcfe52c68c
user: Yuya Nishihara <yuya at tcha.org>
date: Sat Oct 31 22:07:40 2015 +0900
summary: hgweb: use absolute_import
http://selenic.com/repo/hg//rev/e1458049dca5
changeset: 27047:e1458049dca5
user: Siddharth Agarwal <sid0 at fb.com>
date: Sat Nov 14 00:00:46 2015 -0800
summary: filemerge: don't try to copy files known to be absent
http://selenic.com/repo/hg//rev/86290f6f6599
changeset: 27048:86290f6f6599
user: Siddharth Agarwal <sid0 at fb.com>
date: Fri Nov 20 01:14:15 2015 -0800
summary: mergestate._resolve: handle change/delete conflicts
http://selenic.com/repo/hg//rev/0d61f7ec7f76
changeset: 27049:0d61f7ec7f76
user: Siddharth Agarwal <sid0 at fb.com>
date: Sat Nov 14 00:07:11 2015 -0800
summary: mergestate.add: store absentfilectxes as nullhex
http://selenic.com/repo/hg//rev/df9b73d2d444
changeset: 27050:df9b73d2d444
bookmark: @
tag: tip
user: Siddharth Agarwal <sid0 at fb.com>
date: Wed Nov 18 17:40:13 2015 -0800
summary: largefiles: fall back to the original for change/delete conflicts
--
Repository URL: http://selenic.com/repo/hg/
More information about the Mercurial-devel
mailing list