Bug#921704: tortoisehg: uninstallable with mercurial 4.9
Thg Upstream has pushed a 4.9 ta. Cheers, -- Pierre-Yves David
Bug#756018: mercurial: hg clone hangs after adding changesets
O Fri, Jul 25, 2014 at 03:22:05PM +0200, Vincent Lefevre wrote: Package: mercurial Version: 3.0.2-1 Severity: important $ hg clone http://dev.mutt.org/hg/mutt destination directory: mutt requesting all changes adding changesets Then hg is hanging. The CPU, disk and network activity is very low. Looks like the network died. Can you try again with --debug? signature.asc Description: Digital signature
Bug#756018: mercurial: hg clone hangs after adding changesets
On 08/14/2014 02:51 AM, Vincent Lefevre wrote: On 2014-08-14 09:38:05 +0200, Pierre-Yves David wrote: O Fri, Jul 25, 2014 at 03:22:05PM +0200, Vincent Lefevre wrote: $ hg clone http://dev.mutt.org/hg/mutt destination directory: mutt requesting all changes adding changesets Then hg is hanging. The CPU, disk and network activity is very low. Looks like the network died. Perhaps, but in this case, there should be a timeout and an error message. The network must have been still working but very slowly. preventing the process to actually abort. In case the network didn't completely die, hg could also give progress information (see what curl and apt-get do, for instance) and tell how many seconds (when this is large enough) since it last received data (a bit like mosh). You can enable a progress bar (hg help progress for details) that would do exactly that. -- Pierre-Yves David -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#701168: mercurial: Backport improvement to vimdiff configuration
Package: mercurial Version: 2.2.2-2 Severity: important Tags: patch During a merge conflict, vimdiff is very likely to be picked as the default mergetool. This have two majors issues 1) People tends to panic and just quit vimdiff. Vimdiff exit with a 0 returns code and Mercurial see the conflict as resolved when nothing have been done. Ignoring change from on side of the merge. We configure vimdiff with vimdiff.check=changed to detect this situation. If the file did not changed we ask the user if the conflict have been resolve. 2) People tends to not know whats going on and how to get out of vimdiff. We configure vimdiff so display a message when launched hg merge conflict, type :cq to abort vimdiff As a bonus it teach people the :cq command that quit vimdiff with a non-zero exit code. Informing Mercurial that the conflict is unresolved. The previous configuration led to multiple and regular data loss. I would like this config to be backported in wheezy. Here is the patch to apply to mergetool.rc --- /etc/mercurial/hgrc.d/mergetools.rc 2011-09-12 22:38:01.0 +0200 +++ /tmp/mergetools.hgrc2013-02-22 12:01:19.628259820 +0100 @@ -15,7 +15,8 @@ gvimdiff.regname=path gvimdiff.priority=-9 -vimdiff.args=$local $other $base +vimdiff.args=$local $other $base -c 'echohl WarningMsg | echo merge conflict detected, type \:cq\ to abort | echohl' +vimdiff.check=changed vimdiff.priority=-10 merge.checkconflicts=True -- System Information: Debian Release: 6.0.6 APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/16 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash -- Pierre-Yves David http://www.logilab.fr/ signature.asc Description: Digital signature
Bug#650727: mercurial: New upstream release 2.0.1
Package: mercurial Version: 1.6.4-1 Severity: wishlist New upstream version 2.0.1 have been released. No change impacting packaging detected. --- changelog (revision 7895) +++ changelog (working copy) @@ -1,3 +1,9 @@ +mercurial (2.0.1-1) unstable; urgency=low + + * New upstream release 2.0.1 + + -- Pierre-Yves David pierre-yves.da...@logilab.fr Fri, 02 Dec 2011 12:07:32 +0100 + -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#650728: mercurial: new -rc release are not properly parsed by watch
Package: mercurial Version: 1.6.4-1 Severity: minor Upstream now relase a -rc version two weeks before major release (when the coede freeze start). Those version are not properly ordered by the watch script resulting in improper out of date package warning. --- watch (revision 7895) +++ watch (working copy) @@ -6,4 +6,4 @@ #http://www.example.com/downloads.php mercurial-(.*)\.tar\.gz # Uncomment to examine a Webserver directory -http://www.selenic.com/mercurial/release/mercurial-([^s].*)\.tar\.gz +opts=uversionmangle=s/-rc/~rc/ http://www.selenic.com/mercurial/release/mercurial-([^s].*)\.tar\.gz -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
