hg_heads.txt

LOCAL REPOS

faheem@orwell:~/personal$ hg heads
changeset:   2921:2b58d5b403f7
tag:         tip
user:        Faheem Mitha <[email protected]>
date:        Thu Mar 07 04:23:58 2019 +0530
summary:     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

changeset:   2885:ba4585ffbf28
parent:      2882:e2e3674af62f
user:        Faheem Mitha <[email protected]>
date:        Thu Feb 14 16:14:27 2019 +0530
summary:     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

REMOTE REPOS

faheem@orwell:/srv/hg/faheem/personal$ hg heads
changeset:   1796:dae9205cfdc4
tag:         tip
user:        Faheem Mitha <[email protected]>
date:        Wed Feb 13 18:33:22 2019 +0530
summary:     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

CSET CORRESPONDING TO REMOTE HEAD IN LOCAL REPOS

faheem@orwell:~/personal$ hg log -r dae9205cfdc4 --hidden
changeset:   2881:dae9205cfdc4
user:        Faheem Mitha <[email protected]>
date:        Wed Feb 13 18:33:22 2019 +0530
obsolete:    rebased using evolve as 2888:86691978bebd
summary:     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

PUSHING 2b58d5b403f7 TO REMOTE

faheem@orwell:~/personal$ hg push -r 2b58d5b403f local
pushing to /srv/hg/faheem/personal
searching for changes
adding changesets
adding manifests
adding file changes
added 9 changesets with 6 changes to 7 files (+1 heads)
32 new obsolescence markers
transaction abort!
rollback completed
abort: push create a new head on branch "default"

REMOTE STILL HAS THE SAME HEAD

##################################################

faheem@orwell:~/personal$ hg push -r 2b58d5b403f --debug
pushing to ssh://ramnode_hg//srv/hg/faheem/personal
running ssh -C ramnode_hg 'hg -R /srv/hg/faheem/personal serve --stdio'
sending hello command
sending between command
remote: 538
remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache%0Astream%3Dv2 changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
remote: 1
sending protocaps command
invalid branchheads cache (immutable): tip differs
query 1; heads
sending batch command
searching for changes
all remote heads known locally
preparing listkeys for "phases"
sending listkeys command
received listkey for "phases": 42 bytes
preparing listkeys for "namespaces"
sending listkeys command
received listkey for "namespaces": 40 bytes
query 0; add more sample (target 100, current 2)
query 0; sample size is 100, largest range 1666
sending evoext_obshashrange_v1 command
obsdiscovery, 0/1667 mismatch - 1 obshashrange queries in 0.1671 seconds
checking for updated bookmarks
preparing listkeys for "bookmarks"
sending listkeys command
received listkey for "bookmarks": 0 bytes
no changes found
preparing listkeys for "phases"
sending listkeys command
received listkey for "phases": 42 bytes

#################################################################

alias.tracked=status -ramd
alias.odiff=diff --hidden --rev 'limit(precursors(.),1)' --rev .
color.changeset.secret=red bold
color.changeset.draft=green bold
color.changeset.public=black bold
commands.update.check=noconflict
defaults.cdiff=-q
defaults.qpush=--keep-changes
defaults.qpop=--keep-changes
defaults.amend=-D
diff.nodates=1
email.method=/usr/sbin/exim4
email.from=Faheem Mitha <[email protected]>
[email protected]
email.cc=Faheem Mitha <[email protected]>
experimental.crecord=True
experimental.evolution=all
extdiff.cmd.kdiff3=
extdiff.cmd.xxdiff=xxdiff
extdiff.opts.xdiff=-r
extensions.hgext.churn=
extensions.hgext.color=
extensions.hgext.convert=
extensions.hgext.extdiff=
extensions.hgext.graphlog=
extensions.hgext.hgk=
extensions.hgext.journal=
extensions.hgext.keyword=
extensions.hgext.mq=
extensions.hgext.pager=
extensions.hgext.patchbomb=
extensions.hgext.purge=
extensions.hgext.rebase=
extensions.hgext.record=
extensions.hgext.schemes=
extensions.hgext.progress=
extensions.hgext.histedit=
extensions.hgext.shelve=
extensions.hgext3rd.evolve=
extensions.hgext3rd.topic=
graph.default.width=2
graph.default.color=FF0000
merge-tools.kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
merge-tools.kdiff3.regkey=Software\KDiff3
merge-tools.kdiff3.regappend=\kdiff3.exe
merge-tools.kdiff3.fixeol=True
merge-tools.kdiff3.gui=True
merge-tools.kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
mq.secret=true
pager.pager=LESS='FSRX' less
pager.attend=log, help, diff, export
phases.publish=False
tortoisehg.vdiff=kdiff3
tortoisehg.vdiffnowin=True
tortoisehg.authorcolor=True
ui.username=Faheem Mitha <[email protected]>
ui.editor="jed"
ui.merge=kdiff3
ui.ssh=ssh -C
ui.interface=curses
web.cacerts=/etc/ssl/certs/ca-certificates.crt