http://blog.gmane.org/gmane.comp.version-control.mercurial.general hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10832 Hi again, in one of my repositories I have checked in some changeset X for feature A which I could never made to work. Later, I have restarted from X's parent and some dozens of revisions later I finished the same feature A in another way. Now I have this extra head with the unfinished changes which I don't need anymore. This extra head gets in my way when using "hgview" (it always appears at the very top, although it is very old). AFAICS, I have three options: 1) Use a dummy merge to make the unnamed branch inactive. That would look like I actually used code from my first try, which I did not. 2) Use strip/mq/convert etc. to remove this head from my repo. I have no intention to do this. 3) Leave it as it is, and try to fix hgview for example. I would like to have option 4) - mark the branch as inactive without merging it. Apparently, this is not yet possible with hg, right? What do you people think? (I bet most people are content with opion 1, but what do you think about 4?) Have a nice d Hans Meine 2008-12-01T14:52:56 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10830 # HG changeset patch # User Frank Kingswood <frank< at >kingswood-consulting.co.uk> # Date 1228138924 0 # Node ID b1c1b4f98b74bfa32991d33bdb4a47215cdeb842 # Parent 79d1bb737c16b343e33be7cd7e22dcc4e7bfab0b tests: allow cvs import to reorder its filename list also fix script to generate non-zero length test file b. diff -r 79d1bb737c16 -r b1c1b4f98b74 tests/test-convert-cvs-branch --- a/tests/test-convert-cvs-branchMon Dec 01 14:20:20 2008 +0100 +++ b/tests/test-convert-cvs-branchMon Dec 01 13:42:04 2008 +0000 < at >< at > -28,8 +28,9 < at >< at > mkdir src cd src -echo "1" > a > b -cvscall import -m "init" src v0 r0 +echo "1" > a +echo "1" > b +cvscall import -m "init" src v0 r0 | sort cd .. cvscall co src cd src diff -r 79d1bb737c16 -r b1c1b4f98b74 tests/test-convert-cvs-branch.out --- a/tests/test-convert-cvs-branch.outMon Dec 01 14:20:20 2008 +0100 +++ b/tests/test-convert-cvs-branch.outMon Dec 01 13:42:04 2008 +0000 < at >< at > -1,10 +1,10 < at >< at > % create cvs repository % Create a new project + + N src/a N src/b - No conflic Frank Kingswood 2008-12-01T14:24:18 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10828 It would be nice if hg pull could be configured to suppress output when there are no changes transferred. Rationale: I frequently use different "pull many repositories at once" scripts, from for dir in * do hg --cwd $dir pull done to more complicated "syncthemall" scripts. The output of such a command is difficult to read as truly useful information is lost among numerous pulling from (...) searching for changes no changes found messages. I'd prefer to see only info about directories where "something" happened. (at the same time hg -q pull supressess everything, also the useful info) Syntax suggestion: hg pull --silent Alternative syntax suggestion: It could be even better idea to introduce some global option of similar meaning (report "interesting" information but suppress notifications that nothing happened, nothing was found, no files were updated, nothing was added etc etc). This would establish a co Marcin Kasperski 2008-12-01T11:45:30 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10821 Hi, is there any way to include to hg qdiff output the commit message and the user name recorded during qrefresh? Alternatively can I force to include -p option to mq patches as stored under .hgrc/patches ? Regards, Igor Igor Bukanov 2008-11-30T21:37:44 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10813 A user of TortoiseHg has reported this, which I confirmed with recent crew version of Mercurial: $ hg -R crew# tip changeset: 6797:694223a29ad4 tag: tip user: byron< at >base2.cc date: Thu Jul 03 20:53:14 2008 -0700 summary: Added missing --config global option to zsh_completion. $ hg clone crew# c1 abort: repository crew not found! TK Soh 2008-11-30T02:50:46 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10812 Hi everyone, I recently had a chance to upgrade the Hg installation at hg.hellug.gr to a crew snapshot. One of the repositories hosted there is the common `translation tree' of the Greek FreeBSD documentation team at: http://hg.hellug.gr/freebsd/doc-el/ With older versions of Hg we would get commit email notifications whose included patches did not have a charset/encoding. The rest of the email was really encoded with email.charsets = iso-8859-7 though, so most mailers would correctly infer that the patch was iso-8859-7 too. With the recent Mercurial installation, patchbomb seems to be using utf-8 as the email charset, no matter what I try to use in the `.hg/hgrc' file of the relevant repository. Most of the patches we commit in the Greek documentation are encoded in iso-8859-7, so they show up as a long list of question marks in the emails sent by patchbomb, i.e.: % diff -r 913b74dbc96e -r 51e99cebb8bd el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml % --- a/el_GR.ISO8859-7/books/handboo Giorgos Keramidas 2008-11-29T23:03:57 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10797 Running the following script on the local file system works fine. But running it on a CIFS mounted file system causes integrity errors. #!/bin/bash hg init original cd original echo '' > NotRenamed.txt hg add hg commit -m 'NotRenamed' cd .. hg clone original clone cd clone cp NotRenamed.txt Renamed.txt hg remove NotRenamed.txt hg add hg commit -m 'Renamed' hg push hg verify cd ../original hg update hg verify Here is my fstab. If anybody has any suggestions I would be most thankful. //seabsrv01/dev$ /mnt/dev cifs uid=morgan,gid=morgan,credentials=/home/morgan/.smbcredentials,iocharset=utf8,dir_mode=0777,file_mode=0777 0 0 Seamor 2008-11-28T17:06:11 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10796 According to: http://www.ohloh.net/projects/compare?metric=Codebase&project_0=Mercurial&project_1=Git&project_2=Bazaar+Version+Control Git, Bazaar and Mercurial have 350k, 150k and 50k lines of souce code respectively. Initially I made the above comparison between just Git and Mercurial and figured it might be accounted for by the fact that Git is in C and Mercurial is in Python but then I added Bazaar and it is also written in Python. Other possibilities might be how extensions are counted or just plain error in measurement. Does anyone understand the differences between these systems sufficiently to explain these seemingly large differences? Gabor Grothendieck 2008-11-28T18:06:27 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10792 First a few steps to reproduce the problem. Then the question is at the end: ~/tmp$ hg init hgtest ~/tmp$ cd hgtest/ ~/tmp/hgtest$ echo file1 > file1.txt ~/tmp/hgtest$ echo file2 > file2.txt ~/tmp/hgtest$ hg add . adding file1.txt adding file2.txt ~/tmp/hgtest$ hg ci -m "Initial checkin" ~/tmp/hgtest$ ls >> file1.txt ~/tmp/hgtest$ hg ci -m "Change in file1" ~/tmp/hgtest$ hg update 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ~/tmp/hgtest$ ls >> file2.txt ~/tmp/hgtest$ hg ci -m "Change in file2, create another head" created new head ~/tmp/hgtest$ hg merge -r1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) ~/tmp/hgtest$ hg ci -m "Merge" ~/tmp/hgtest$ hg log -v -r3 changeset: 3:936aaa1c9975 tag: tip parent: 2:1dd8a64b18b0 parent: 1:741fd3bcb38d user: Jens Lund <jens.lund< at >nordea.com> date: Fri Nov 28 12:31:52 2008 +0100 description: Merge What puzzles we is that the merge commit (3) show jens.lund< at >nordea.com 2008-11-28T12:37:56 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10778 Hi everyone, I've been using two script-wrappers for merging for a while now: hg-merge This one tries Mercurial's pre-merge, then diff3 and falls back to merging in an ${EDITOR} buffer with conflict markers. ediff-merge This one disables pre-merge, it tries diff3 but if that fails too it starts with a clean copy of $local and fires up Emacs in ediff-mode to do a 3-way merge. The .hgrc options that enable these are: [merge-tools] ediff.priority = 0 ediff.premerge = False ediff.binary = False ediff.gui = True ediff.executable = /home/keramida/bin/ediff-merge ediff.args = $local $base $other script.priority = 1 script.premerge = True script.binary = False script.gui = False script.executable = /home/keramida/bin/hg-merge script.args = $local $base $other and I have in my ~/bin directory the attached scripts. Do these look ok as merge helpers for UNIX workstations? Should I add these to the Wiki? Giorgos Keramidas 2008-11-28T04:24:28 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10768 Hello, I'm using Mercurial on Windows using the command line, and would like to ask how to set up merge to use the WinMerge utility. Specifically, the online documentation shows this for kdiff3: <quote> In Mercurial 1.0 you can add the following to .hgrc: [merge-tools] kdiff3.args = $base $local $other -o $output </quote> and I'd like to ask what .hgrc configuration is necessary for this. Many thanks! Bye, TD The Dude 2008-11-27T07:37:24 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10767 Hi, I got the message below when running hg qpush gfx_debugging_stuff_2008-11-25.diff on a Mozilla repository. After this, the queue state looks like this $ hg qa 0 U gfx_debugging_stuff_2008-11-25.diff 1 A cairo-os2_fix_as_upstream.diff 2 A bug453705_domquickstubs.diff 3 A bug451278_nscom_workaround.diff The files that the patch is supposed to touch were not changed. I worked around this problem now by doing hg qpop -a before trying the qpush again... The messages don't look like a system specific problem, but this is with Mercurial running on OS/2. Cheers, Peter. ** report bug details to http://www.selenic.com/mercurial/bts ** or mercurial< at >selenic.com ** Mercurial Distributed SCM (version a490a0c59b94fef613ac87813e12b992421d0948) Traceback (most recent call last): File "f:/Python/Scripts/hg", line 22, in ? mercurial.dispatch.run() File "f:/Python/lib/site-packages/mercurial/dispatch.py", line 20, in run sys.exit(dispatch(sys.argv[1:])) File "f:/Python/ Peter Weilbacher 2008-11-27T07:29:54 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10761 allnightlong 2008-11-26T23:40:27 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10758 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Mozilla is going to cut a long-lived release branch shortly. We will be cherry-picking individual changes from the trunk to the release branch. I originally thought that the rebase extension would be perfect for this task: hg rebase -s revtocherrypick -t releasebranch But I forgot that rebase will not rebase the single revision I'm interested in: it will only rebase entire branches. The transplant extension could be used for this, but doesn't do 3-way merging (and the rebase extension is in general better designed). How hard would it be to add "rebase a single revision" to the rebase extension? - --BDS -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFJLWriSSwGp5sTYNkRApc8AKDFSkO6OdFLtNVljy7iOQOYRY9xjgCeL8y0 o4zeG35ugDZneposLEYhTz8= =JbZh -----END PGP SIGNATURE----- Benjamin Smedberg 2008-11-26T15:27:30 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10745 Since the 1.1 release is approaching, it would be nice to have some additional testing, preferably using crew repo: http://hg.intevation.org/mercurial/crew Thanks! Benoit Benoit Boissinot 2008-11-26T11:29:26 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10736 some time ago someone showed me the very nice graphical diff-tool called tkdiff. The latest version that I got from sourceforce however doesn't support hg. Still, someone already submitted a very complete patch for hg in the bug-tracking system (http://tinyurl.com/5g3hjv) But apparently nothing is happening with tkdiff anymore and the patch was not applied yet. Today I found out that it was maintained by the Debian QA-Group for some time, but it was orphaned and needs a new maintainer (http://packages.qa.debian.org/t/tkdiff.html) Maybe someone on this list happens to have an interest in becoming the maintainer? J.S. van Bethlehem 2008-11-25T12:37:11 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10734 Hello, I see most web styles offer repository files listing at arbitrary revision with entry size. I'm interested into this information and I would like to make hg output it from the CLI, for exemple using locate with --template ... {size} ... or so. But it seems that locate won't use --template, so I'm a bit stuck. I'm still a bit lost with differences between hg web styles and CL templates. How would you recommand me to proceed please ? Thanks Paul R 2008-11-25T11:28:21 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10732 Hi, is there a hook script which makes sure that something like "hg id"'s output can be fed into some file or process at clone time or after an update? Marko Marko Käning 2008-11-25T10:18:49 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10713 Bastian Doetsch 2008-11-24T18:09:38 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10711 Benjamin Johnson 2008-11-24T16:26:14 http://comments.gmane.org/gmane.comp.version-control.mercurial.general/10707 Hi! I've been trying to customize the look&feel of my hgweb to match the rest of the layout of my site, but I haven't been able to find a reference of how to customize it. Are there any reference documentation on how to write my own templates? Is hgweb using any standard templating mechanism that I can look at? -- Trygve Trygve Laugstøl 2008-11-24T15:04:29 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.comp.version-control.mercurial.general