Matt Mackall <mpm@selenic.com> [Mon, 15 Nov 2010 17:04:55 -0600] rev 13000
commit: search both parents for missing copy revision (issue2484)
raise a proper abort if we can't find an ancestor
Matt Mackall <mpm@selenic.com> [Mon, 15 Nov 2010 17:00:43 -0600] rev 12999
context: walk both parents for workingctx.ancestors()
Adrian Buehlmann <adrian@cadifra.com> [Thu, 11 Nov 2010 15:51:20 +0100] rev 12998
discovery: list new remote heads in prepush() on --debug
With this patch applied, Mercurial will list the hashes of new remote heads
if push --debug aborts because of new remote heads (option -f/--force not set).
Example:
$ hg push --debug repo1
using http://example.org/repo1
http auth: user johndoe, password not set
sending between command
pushing to http://example.org/repo1
sending capabilities command
capabilities: changegroupsubset stream=1 lookup pushkey unbundle=HG10GZ,HG10BZ,HG10UN branchmap
sending heads command
searching for changes
common changesets up to 609edbc7853f
sending branchmap command
new remote heads on branch 'default' <- new output line
new remote head 5862c07f53a2 <- new output line
abort: push creates new remote heads on branch 'default'!
(did you forget to merge? use push -f to force)
Compare to without --debug (not changed by this patch, including it here
for reference purposes only):
$ hg push repo1
pushing to http://example.org/repo1
searching for changes
abort: push creates new remote heads on branch 'default'!
(did you forget to merge? use push -f to force)
Motivation for this change:
'hg outgoing' may list a whole lot of benign changesets plus an odd changeset
that will trigger the "new remote heads" abort. It can be hard to spot that
single unwanted changeset (it may be an old forgotten experiment, lingering
in the local repo).
"hg log -r 'heads(outgoing())'" might be useful, but that also lists a head
that may be benign on push.
Inside prepush(), we already know which heads are causing troubles on 'hg push'.
Why not make that info available (at least on --debug)?
This would also be helpful for doing remote support, as the supporter can ask
the user to paste the output of 'hg push --debug' on error and then ask further
questions about the heads listed.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 11 Nov 2010 15:42:27 +0100] rev 12997
discovery: remove erroneous comment in prepush()
New named branches *can* be created without -f/--force by specifying
--new-branch
Eric Eisner <ede@mit.edu> [Sun, 14 Nov 2010 18:31:40 -0500] rev 12996
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu> [Sun, 14 Nov 2010 18:31:29 -0500] rev 12995
subrepo: update and merge works with any git branch
Eric Eisner <ede@mit.edu> [Sun, 14 Nov 2010 18:22:33 -0500] rev 12994
subrepo: allow git subrepos to push and merge
(master branch only)
gitsubrepo based on patch from David Soria Parra:
http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/
Eric Eisner <ede@mit.edu> [Sun, 14 Nov 2010 18:20:13 -0500] rev 12993
subrepo: cloning and updating of git subrepos
gitsubrepo based on patch from David Soria Parra:
http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/
Eric Eisner <ede@mit.edu> [Sun, 14 Nov 2010 18:15:26 -0500] rev 12992
subrepo: support for adding a git subrepo
gitsubrepo based on patch from David Soria Parra:
http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/
Matt Mackall <mpm@selenic.com> [Mon, 15 Nov 2010 10:57:49 -0600] rev 12991
merge with stable