mercurial at 22043: 15 new changesets

[Mercurial Commits]

15 new changesets in mercurial:

http://selenic.com/repo/hg//rev/f28329171a86
changeset:   22029:f28329171a86
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Mon Aug 04 16:39:47 2014 -0700
summary:     test-merge-tools: introduce a "revision 4" that merges with conflict

http://selenic.com/repo/hg//rev/ecdff28d13e2
changeset:   22030:ecdff28d13e2
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Mon Aug 04 16:50:15 2014 -0700
summary:     mergetools: add a test for premerge --keep

http://selenic.com/repo/hg//rev/b36c60cfe46f
changeset:   22031:b36c60cfe46f
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Mon Aug 04 16:58:39 2014 -0700
summary:     merge-tools: make premerge valid values extensible

http://selenic.com/repo/hg//rev/d7f25834ffbb
changeset:   22032:d7f25834ffbb
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Mon Aug 04 16:32:41 2014 -0700
summary:     merge-tools: add a `premerge=keep-merge3` config option

http://selenic.com/repo/hg//rev/342e7c428e47
changeset:   22033:342e7c428e47
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Fri Jul 04 19:31:49 2014 +0200
summary:     push: explicitly encode a list of obsmarkers to push

http://selenic.com/repo/hg//rev/5f57bc77657c
changeset:   22034:5f57bc77657c
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Sat Jul 05 19:17:09 2014 +0200
summary:     push: move the list of obsmarker to push into the push operation

http://selenic.com/repo/hg//rev/24bb01f42e82
changeset:   22035:24bb01f42e82
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Sat Jul 05 19:32:20 2014 +0200
summary:     push: introduce a discovery step for obsmarker

http://selenic.com/repo/hg//rev/f1528ef123f4
changeset:   22036:f1528ef123f4
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Thu Jul 31 13:51:17 2014 -0700
summary:     push: use stepsdone for obsmarkers push

http://selenic.com/repo/hg//rev/8665c647da6e
changeset:   22037:8665c647da6e
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Aug 05 21:16:24 2014 -0700
summary:     config: fix restoreconfig of non existing config

http://selenic.com/repo/hg//rev/021becbf024a
changeset:   22038:021becbf024a
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Aug 05 13:22:44 2014 -0700
summary:     rebase: do not retract phase boundary by hand

http://selenic.com/repo/hg//rev/0aa2cb965f4c
changeset:   22039:0aa2cb965f4c
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Aug 05 18:53:05 2014 -0700
summary:     commit: update the --secret code to use backupconfig and restoreconfig

http://selenic.com/repo/hg//rev/122fa73657c6
changeset:   22040:122fa73657c6
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Aug 05 14:37:45 2014 -0700
summary:     shelve: do not retract phase boundary by hand

http://selenic.com/repo/hg//rev/97f86ce79abe
changeset:   22041:97f86ce79abe
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Aug 05 13:49:38 2014 -0700
summary:     changegroup: add a `targetphase` argument to `addchangegroup`

http://selenic.com/repo/hg//rev/8d99c107b041
changeset:   22042:8d99c107b041
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Aug 05 13:51:13 2014 -0700
summary:     shelve: use `targetphase` while unbundling

http://selenic.com/repo/hg//rev/1274ff3f20a8
changeset:   22043:1274ff3f20a8
tag:         tip
user:        Matt Mackall <mpm at selenic.com>
date:        Wed Aug 06 02:45:55 2014 -0500
summary:     contrib: add check-commit hook script to sanity-check commits

-- 
Repository URL: http://selenic.com/repo/hg/