'hg log filename' does not show tip cset
Faheem Mitha
faheem at faheem.info
Thu Jul 17 18:40:49 UTC 2014
Hi,
This was bounced, so I am resending. Apparently, .info domains are evil. I
wish someone had told me.
I've now posted http://bz.selenic.com/show_bug.cgi?id=4307, which is
essentially the content of this email. Including an attached repos tarball
to reproduce the problem.
This is likely related/triggered by obsolete markers / the evolve
extension. Jordi commented that stripping out the obsolete csets made the
problem go away.
F.
##########################################################################
This might be better as a bug report, but I'm not completely sure if it is
a bug, or where it is coming from.
I created a cset, using the evolve extension (I don't know if this is
relevant.) This cset created some files. Those files here don't show up
when I run hg log. Here is the example output
faheem at orwell:~/personal_evolvetest/business/smyt$ LC_ALL=C hg glog -vr. --stat
--hidden
@ changeset: 1076:6fd22ef79fda
| tag: tip
| parent: 1062:cfc4db9ba0f6
| user: Faheem Mitha <faheem at faheem.info>
| date: Thu Jul 17 05:13:44 2014 +0530
| files: business/smyt/makhija9.tex business/smyt/smyt25.tex
business/smyt/smyt26.tex
| description:
| <snip>
|
|
| business/smyt/makhija9.tex | 60
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
| business/smyt/smyt25.tex | 62
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
| business/smyt/smyt26.tex | 53
+++++++++++++++++++++++++++++++++++++++++++++++++++++
| 3 files changed, 175 insertions(+), 0 deletions(-)
|
faheem at orwell:~/personal_evolvetest/business/smyt$ hg log -vr 1076 makhija9.tex
--hidden
faheem at orwell:~/personal_evolvetest/business/smyt$ hg log -vr 1076 smyt25.tex
--hidden
faheem at orwell:~/personal_evolvetest/business/smyt$ hg log -vr 1076 smyt26.tex
--hidden
aheem at orwell:~/personal_evolvetest/business/smyt$ hg phase -r 1076
1076: draft
Any idea what is going on here? This is a regular cset, not an
obsolete/hidden one, but it is a draft cset.
Note also that these files were created in this cset.
hg --version
Mercurial Distributed SCM (version 3.0.1)
`hg config` is quite large, so I put it at the bottom.
Regards, Faheem
PS. planet on #mercurial reports
################################################################
ingo at aeolus:~/ottd/trunk$ LC_ALL=C hg glog -r. --stat
@ [draft] tip mhl-ice111 21741:ffb8af6b9dd5 2014-07-16 12:56 +0200
planetmaker
| Patch: More Heightlevels: A parameter controlling desert height
|
| src/landscape.cpp | 2 +-
| 1 files changed, 1 insertions(+), 1 deletions(-)
ingo at aeolus:~/ottd/trunk$ hg glog src/landscape.cpp -l3
o [public] 21458:c440d3cc92ec 2014-04-23 20:13 +0000 rubidium
| (svn r26482) -Codechange: add an include that allows us to
undefine/redefine "unsafe" functions to prevent them from being used, and thus
having to care about certain aspects of their return values
|
| o [draft] 21438:78587412e6a7 2014-04-13 13:12 +0200 planetmaker
|/ -Codechange: Cache the distance to the nearest water (or land)
tile
|
o [public] 21294:55bfc80430d3 2014-02-09 15:00 +0000 fonsinchen
| (svn r26323) -Fix: update some constants related to map size.
|
ingo at aeolus:~/ottd/trunk$ hg config
alias.glog=log -G --template='[{phase}] {tags} {bookmarks}
{rev}:{node|short}\t{date|isodate}\t{author|person}\n\t{desc|tabindent}\n\n'
bundle.mainreporoot=/home/ingo/ottd/trunk
diff.git=True
extensions.color=
extensions.purge=
extensions.hgext.convert=
extensions.hgext.bookmarks=
extensions.hggit=/home/ingo/bin/mercurial/hg-git/hggit
extensions.rebase=
extensions.record=
extensions.evolve=/home/ingo/bin/mercurial/mutable-history/hgext/evolve.py
extensions.mq=
extensions.shelve=
ingo at aeolus:~/ottd/trunk$ LC_ALL=C hg --version
Mercurial Distributed SCM (version 3.0.1)
#######################################################################
output of Faheem's `hg config`
########################################################################
alias.tracked=status -ramd
alias.mpush=!$HG push
bundle.mainreporoot=/home/faheem/personal_evolvetest
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 <faheem at faheem.info>
email.to=mercurial-devel at selenic.com
email.cc=Faheem Mitha <faheem at faheem.info>
extdiff.cmd.kdiff3=kdiff3
extensions.hgext.bookmarks=
extensions.hgext.churn=
extensions.hgext.color=
extensions.hgext.convert=
extensions.hgext.extdiff=
extensions.hgext.graphlog=
extensions.hgext.hgk=
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.hgext.evolve=
merge-tools.gvimdiff.args=--nofork -d -g -O $local $other $base
merge-tools.gvimdiff.regkey=Software\Vim\GVim
merge-tools.gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
merge-tools.gvimdiff.regname=path
merge-tools.gvimdiff.priority=-9
merge-tools.vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge
conflict, type \":cq\" to abort vimdiff"'
merge-tools.vimdiff.check=changed
merge-tools.vimdiff.priority=-10
merge-tools.merge.check=conflicts
merge-tools.merge.priority=-100
merge-tools.gpyfm.gui=True
merge-tools.meld.check=changed
merge-tools.diffmerge.check=changed
merge-tools.tortoisemerge.check=changed
merge-tools.filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
merge-tools.filemerge.args=-left $other -right $local -ancestor $base -merge
$output
merge-tools.filemerge.gui=True
merge-tools.winmerge.args=/e /x /wl /ub /dl other /dr local $other $local
$output
merge-tools.winmerge.regkey=Software\Thingamahoochie\WinMerge
merge-tools.winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
merge-tools.winmerge.regname=Executable
merge-tools.winmerge.check=changed
merge-tools.winmerge.gui=True
merge-tools.winmerge.priority=-10
merge-tools.winmerge.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel'
$parent $child
merge-tools.araxis.checkconflict=True
merge-tools.UltraCompare.check=conflicts,changed
merge-tools.beyondcompare4.priority=-1
merge-tools.beyondcompare4.args=$local $other $base /mergeoutput=$output /ro
/lefttitle=parent1 /centertitle=base /righttitle=parent2 /outputtitle=merged
/automerge /reviewconflicts /solo
merge-tools.beyondcompare4.premerge=False
merge-tools.beyondcompare4.regkey=Software\Scooter Software\Beyond Compare 4
merge-tools.beyondcompare4.regkeyalt=Software\Wow6432Node\Scooter
Software\Beyond Compare 4
merge-tools.beyondcompare4.regname=ExePath
merge-tools.beyondcompare4.gui=True
merge-tools.beyondcompare4.diffargs=/lro /lefttitle='$plabel1'
/righttitle='$clabel' /solo /expandall $parent $child
merge-tools.beyondcompare4.diff3args=$parent1 $parent2 $child
/lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /ro
merge-tools.beyondcompare4.dirdiff=True
merge-tools.beyondcompare4-noauto.executable=beyondcompare4
merge-tools.beyondcompare4-noauto.priority=-1
merge-tools.beyondcompare4-noauto.args=$local $other $base /mergeoutput=$output
/ro /lefttitle=parent1 /centertitle=base /righttitle=parent2
/outputtitle=merged /reviewconflicts /solo
merge-tools.beyondcompare4-noauto.premerge=False
merge-tools.beyondcompare4-noauto.regkey=Software\Scooter Software\Beyond
Compare 4
merge-tools.beyondcompare4-noauto.regkeyalt=Software\Wow6432Node\Scooter
Software\Beyond Compare 4
merge-tools.beyondcompare4-noauto.regname=ExePath
merge-tools.beyondcompare4-noauto.gui=True
merge-tools.beyondcompare4-noauto.diffargs=/lro /lefttitle='$plabel1'
/righttitle='$clabel' /solo /expandall $parent $child
merge-tools.beyondcompare4-noauto.diff3args=$parent1 $parent2 $child
/lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /ro
merge-tools.beyondcompare4-noauto.dirdiff=True
merge-tools.beyondcompare3.priority=-1
merge-tools.beyondcompare3.args=$local $other $base /mergeoutput=$output /ro
/lefttitle=parent1 /centertitle=base /righttitle=parent2 /outputtitle=merged
/automerge /reviewconflicts /solo
merge-tools.beyondcompare3.premerge=False
merge-tools.beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
merge-tools.beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter
Software\Beyond Compare 3
merge-tools.beyondcompare3.regname=ExePath
merge-tools.beyondcompare3.gui=True
merge-tools.beyondcompare3.diffargs=/lro /lefttitle='$plabel1'
/righttitle='$clabel' /solo /expandall $parent $child
merge-tools.beyondcompare3.diff3args=$parent1 $parent2 $child
/lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /ro
merge-tools.beyondcompare3.dirdiff=True
merge-tools.beyondcompare3-noauto.executable=beyondcompare3
merge-tools.beyondcompare3-noauto.priority=-1
merge-tools.beyondcompare3-noauto.args=$local $other $base /mergeoutput=$output
/ro /lefttitle=parent1 /centertitle=base /righttitle=parent2
/outputtitle=merged /reviewconflicts /solo
merge-tools.beyondcompare3-noauto.premerge=False
merge-tools.beyondcompare3-noauto.regkey=Software\Scooter Software\Beyond
Compare 3
merge-tools.beyondcompare3-noauto.regkeyalt=Software\Wow6432Node\Scooter
Software\Beyond Compare 3
merge-tools.beyondcompare3-noauto.regname=ExePath
merge-tools.beyondcompare3-noauto.gui=True
merge-tools.beyondcompare3-noauto.diffargs=/lro /lefttitle='$plabel1'
/righttitle='$clabel' /solo /expandall $parent $child
merge-tools.beyondcompare3-noauto.diff3args=$parent1 $parent2 $child
/lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /ro
merge-tools.beyondcompare3-noauto.dirdiff=True
merge-tools.beyondcompare2.priority=-4
merge-tools.beyondcompare2.args=/ro /title1="Original" /title2="Working copy"
$local $other
merge-tools.beyondcompare2.regkey=Software\Scooter Software\Beyond Compare
merge-tools.beyondcompare2.regkeyalt=Software\Wow6432Node\Scooter
Software\Beyond Compare
merge-tools.beyondcompare2.regname=ExePath
merge-tools.beyondcompare2.gui=True
merge-tools.beyondcompare2.diffargs=/lro /title1='$plabel1' /title2='$clabel'
$parent $child
merge-tools.beyondcompare2.dirdiff=True
merge-tools.araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
merge-tools.araxis.regappend=\ConsoleCompare.exe
merge-tools.araxis.priority=-2
merge-tools.araxis.args=/3 /a2 /wait /merge /title1:"Parent 1" /title2:"Merge
Result: "$output /title3:"Parent 2" $local $base $other $output
merge-tools.araxis.premerge=False
merge-tools.araxis.checkconflicts=True
merge-tools.araxis.binary=True
merge-tools.araxis.gui=True
merge-tools.araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel"
$parent $child
merge-tools.araxis.diff3args=/3 /a2 /wait /title1:"$plabel1" /title2:"$clabel"
/title3:"$plabel2" $parent1 $child $parent2
merge-tools.araxis.dirdiff=True
merge-tools.araxis.dir3diff=True
merge-tools.UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App
Paths\UC.exe
merge-tools.UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App
Paths\UC.exe
merge-tools.UltraCompare.args=$base $local $other -title1 base -title3 other
merge-tools.UltraCompare.priority=-2
merge-tools.UltraCompare.gui=True
merge-tools.UltraCompare.binary=True
merge-tools.UltraCompare.checkconflicts=True
merge-tools.UltraCompare.checkchanged=True
merge-tools.UltraCompare.diffargs=$child $parent -title1 $clabel -title2
$plabel1
merge-tools.UltraCompare.diff3args=$parent1 $child $parent2 -title1 $plabel1
-title2 $clabel -title3 $plabel2
merge-tools.kdiff3.priority=-3
merge-tools.kdiff3.regkeyalt=Software\Wow6432Node\KDiff3
merge-tools.kdiff3.premerge=False
merge-tools.kdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2'
$parent1 $child $parent2
merge-tools.kdiff3.dirdiff=True
merge-tools.kdiff3-noauto.executable=kdiff3
merge-tools.kdiff3-noauto.priority=-4
merge-tools.kdiff3-noauto.args=--L1 base --L2 parent1 --L3 parent2 $base $local
$other -o $output
merge-tools.kdiff3-noauto.regkey=Software\KDiff3
merge-tools.kdiff3-noauto.regkeyalt=Software\Wow6432Node\KDiff3
merge-tools.kdiff3-noauto.regappend=\kdiff3.exe
merge-tools.kdiff3-noauto.fixeol=False
merge-tools.kdiff3-noauto.premerge=False
merge-tools.kdiff3-noauto.gui=True
merge-tools.kdiff3-noauto.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent
$child
merge-tools.kdiff3-noauto.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3
'$plabel2' $parent1 $child $parent2
merge-tools.kdiff3-noauto.dirdiff=True
merge-tools.diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
merge-tools.diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear
DiffMerge\
merge-tools.diffmerge.regname=Location
merge-tools.diffmerge.priority=-7
merge-tools.diffmerge.args=-nosplash -merge -title1=local -title2=merged
-title3=other $local $base $other -result=$output
merge-tools.diffmerge.checkchanged=True
merge-tools.diffmerge.gui=True
merge-tools.diffmerge.diffargs=--nosplash --title1='$plabel1'
--title2='$clabel' $parent $child
merge-tools.diffmerge.diff3args=--nosplash --title1='$plabel1'
--title2='$clabel' --title3='$plabel2' $parent1 $child $parent2
merge-tools.diffmerge.dirdiff=True
merge-tools.diffmerge3.regkey=Software\SourceGear\Common\DiffMerge\Installer
merge-tools.diffmerge3.regkeyalt=Software\Wow6432Node\SourceGear\Common\DiffMerge\Installer
merge-tools.diffmerge3.regname=Location
merge-tools.diffmerge3.priority=-7
merge-tools.diffmerge3.args=-nosplash -merge -title1=local -title2=merged
-title3=other $local $base $other -result=$output
merge-tools.diffmerge3.checkchanged=True
merge-tools.diffmerge3.gui=True
merge-tools.diffmerge3.diffargs=--nosplash --title1='$plabel1'
--title2='$clabel' $parent $child
merge-tools.diffmerge3.diff3args=--nosplash --title1='$plabel1'
--title2='$clabel' --title3='$plabel2' $parent1 $child $parent2
merge-tools.diffmerge3.dirdiff=True
merge-tools.p4merge.priority=-8
merge-tools.p4merge.args=$base $local $other $output
merge-tools.p4merge.regkey=Software\Perforce\Environment
merge-tools.p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment
merge-tools.p4merge.regname=P4INSTROOT
merge-tools.p4merge.regappend=\p4merge.exe
merge-tools.p4merge.gui=True
merge-tools.p4merge.diffargs=$parent $child
merge-tools.p4merge.diff3args=$child $parent1 $parent2
merge-tools.p4merge.dirdiff=False
merge-tools.p4merge.checkchanged=True
merge-tools.tortoisemerge.priority=-9
merge-tools.tortoisemerge.args=/base:$base /mine:$local /theirs:$other
/merged:$output
merge-tools.tortoisemerge.regkey=Software\TortoiseSVN
merge-tools.tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
merge-tools.tortoisemerge.checkchanged=True
merge-tools.tortoisemerge.gui=True
merge-tools.tortoisemerge.diffargs=/base:$parent /mine:$child
/basename:'$plabel1' /minename:'$clabel'
merge-tools.tortoisegitmerge.priority=-9
merge-tools.tortoisegitmerge.args=/base:$base /mine:$local /theirs:$other
/merged:$output
merge-tools.tortoisegitmerge.regkey=Software\TortoiseGit
merge-tools.tortoisegitmerge.regkeyalt=Software\Wow6432Node\TortoiseGit
merge-tools.tortoisegitmerge.regname=TMergePath
merge-tools.tortoisegitmerge.checkchanged=True
merge-tools.tortoisegitmerge.gui=True
merge-tools.tortoisegitmerge.diffargs=/base:$parent /mine:$child
/basename:'$plabel1' /minename:'$clabel'
merge-tools.ecmerge.priority=-10
merge-tools.ecmerge.args=$base $local $other --mode=merge3 --title0=base
--title1=local --title2=other --to=$output
merge-tools.ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
merge-tools.ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
merge-tools.ecmerge.gui=True
merge-tools.ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1'
--title2='$clabel'
merge-tools.ecmerge.diff3args=$child $parent1 $parent2 --mode=diff3
--title0='$clabel' --title1='$plabel1' --title2='$plabel2'
merge-tools.ecmerge.dirdiff=True
merge-tools.ecmerge.dir3diff=True
merge-tools.winmergeu.regkey=Software\Thingamahoochie\WinMerge\
merge-tools.winmergeu.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
merge-tools.winmergeu.regname=Executable
merge-tools.winmergeu.priority=-10
merge-tools.winmergeu.args=/e /x /wl /ub /dl other /dr local $other $local
$output
merge-tools.winmergeu.fixeol=True
merge-tools.winmergeu.checkchanged=True
merge-tools.winmergeu.gui=True
merge-tools.winmergeu.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel'
$parent $child
merge-tools.winmergeu.diff3args=
merge-tools.winmergeu.dirdiff=True
merge-tools.meld.regkey=SOFTWARE\Meld
merge-tools.meld.regkeyalt=SOFTWARE\Wow6432Node\Meld
merge-tools.meld.regname=Executable
merge-tools.meld.gui=True
merge-tools.meld.args=--label='local' $local --label='base' $base
--label='other' $other
merge-tools.meld.priority=-2
merge-tools.meld.diffargs=-a --label='$plabel1' $parent --label='$clabel'
$child
merge-tools.meld.diff3args=-a --label='$plabel1' $parent1 --label='$clabel'
$child --label='$plabel2' $parent2
merge-tools.meld.dirdiff=True
merge-tools.docdiff.priority=-100
merge-tools.docdiff.regkey=Software\TortoiseHg
merge-tools.docdiff.regappend=\docdiff.exe
merge-tools.docdiff.args=$local $base $other $output
merge-tools.docdiff.gui=True
merge-tools.docdiff.diffargs=$child $parent
merge-tools.docdiff.diff3args=$parent1 $child $parent2 $child
merge-tools.docdiff.usewin=True
merge-tools.rekisa.priority=-1
merge-tools.rekisa.args=-Title=Base "$base" -Title=Local "$local" -Title=Other
"$other"
merge-tools.rekisa.gui=True
merge-tools.rekisa.diffargs="-Title=$plabel1" "$parent" "-Title=$clabel"
"$child"
merge-tools.rekisa.diff3args="-Title=$plabel1" "$parent1" "-Title=$clabel"
"$child" "-Title=$plabel2" "$parent2"
merge-tools.rekisa.dirdiff=False
merge-tools.codecompare_diff.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\CodeCompare_is1
merge-tools.codecompare_diff.regname=InstallLocation
merge-tools.codecompare_diff.regappend=CodeCompare.exe
merge-tools.codecompare_diff.diffargs=/SC=TortoiseHg /title1="$plabel1"
/title2="$clabel" $parent $child
merge-tools.codecompare_diff.diff3args=/SC=TortoiseHg /title1="$plabel1"
/title2="$clabel" /title3="$plabel2" $parent1 $child $parent2
merge-tools.codecompare_diff.binary=False
merge-tools.codecompare_diff.gui=True
merge-tools.codecompare_diff.dirdiff=True
merge-tools.codecompare_merge.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\CodeCompare_is1
merge-tools.codecompare_merge.regname=InstallLocation
merge-tools.codecompare_merge.regappend=CodeMerge.exe
merge-tools.codecompare_merge.args=/SC=TortoiseHg /TF=$other /MF=$local
/RF=$output /BF=$base /TT="Other: $other" /MT="Local: $local" /RT="Output:
$output" /BT="Base: $base"
merge-tools.codecompare_merge.binary=False
merge-tools.codecompare_merge.gui=True
merge-tools.codecompare_merge.checkconflicts=True
merge-tools.codecompare_merge.premerge=Keep
merge-tools.bcompare.priority=-1
merge-tools.bcompare.args=$local $other $base -mergeoutput=$output -ro
-lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged
-automerge -reviewconflicts -solo
merge-tools.bcompare.premerge=False
merge-tools.bcompare.gui=True
merge-tools.bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel'
-solo -expandall $parent $child
merge-tools.bcompare.diff3args=$parent1 $parent2 $child -lefttitle='$plabel1'
-centertitle='$clabel' -righttitle='$plabel2' -solo -expandall
merge-tools.bcompare.dirdiff=True
merge-tools.diffuse.priority=-3
merge-tools.diffuse.args=$local $base $other
merge-tools.diffuse.gui=True
merge-tools.diffuse.diffargs=$parent $child
merge-tools.diffuse.diff3args=$parent1 $child $parent2
merge-tools.diffuse.dirdiff=False
merge-tools.xxdiff.priority=-4
merge-tools.xxdiff.args=--show-merged-pane --exit-with-merge-status --title1
local --title2 base --title3 other --merged-filename $output --merge $local
$base $other
merge-tools.xxdiff.gui=True
merge-tools.xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel'
$child
merge-tools.xxdiff.diff3args=--title1 '$plabel1' $parent1 --title2 '$clabel'
$child --title3 '$plabel2' $parent2
merge-tools.xxdiff.dirdiff=True
merge-tools.tkdiff.args=-L local -L other $local $other -a $base -o $output
merge-tools.tkdiff.gui=True
merge-tools.tkdiff.priority=-5
merge-tools.tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child
merge-tools.tkdiff.diff3args=
merge-tools.tkdiff.dirdiff=False
merge-tools.rhapsody_diffmerge.regkey=Software\Telelogic\Rhapsody\DiffMerge\
merge-tools.rhapsody_diffmerge.regkeyalt=Software\Wow6432Node\Telelogic\Rhapsody\DiffMerge\
merge-tools.rhapsody_diffmerge.regname=Install Path
merge-tools.rhapsody_diffmerge.priority=-110
merge-tools.rhapsody_diffmerge.args=-xmerge $other $local -base $base -out
$output
merge-tools.rhapsody_diffmerge.checkchanged=True
merge-tools.rhapsody_diffmerge.gui=True
merge-tools.rhapsody_diffmerge.diffargs=-xcompare $parent $child
merge-tools.rhapsody_diffmerge.diff3args=
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
paths.default=ssh://bulldog_hg//srv/hg/faheem/personal_evolvetest
tortoisehg.vdiff=kdiff3
tortoisehg.vdiffnowin=True
tortoisehg.authorcolor=True
ui.username=Faheem Mitha <faheem at faheem.info>
ui.editor="jed"
ui.merge=kdiff3
ui.ssh=ssh -C
web.cacerts=/etc/ssl/certs/ca-certificates.crt
More information about the Mercurial
mailing list