commit mercurial for openSUSE:Factory
Hello community,
here is the log from the commit of package mercurial for openSUSE:Factory
checked in at Mon Mar 28 11:05:23 CEST 2011.
--------
--- mercurial/mercurial.changes 2011-03-09 12:57:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/mercurial/mercurial.changes 2011-03-25 13:42:22.000000000 +0100
@@ -1,0 +2,21 @@
+Fri Mar 25 12:37:39 UTC 2011 - chris@computersalat.de
+
+- update to version 1.8.1
+ * annotate: rewrite to deal with crossed linkrevs (issue2682)
+ * bookmark: fix invalidation of localrepo._bookmarkcurrent
+ * cacert: improve error report when web.cacert file does not exist
+ * contrib: update tcsh_completion for Mercurial 1.8
+ * hgcia: accept "queued." xmlrpc return as success
+ * hgweb: fix filelog rss links generation
+ * hgweb: use tip in gitweb/monoblue filelog rss links (issue2677)
+ * merge: back out single-parent fast-forward merge
+ * merge: drop resolve state for mergers with identical contents (issue2680)
+ * merge: improve unresolved conflicts warning (issue2681)
+ * mergetools: add alternate registry keys for 32bit apps on 64bit O/S
+ * mq: forbid commit of merge involving mq patches
+ * subrepo: backout 67fbe566eff1, --force requires svn >= 1.5
+ * subrepo: don't crash when git repo is missing
+ * subrepo: handle svn tracked/unknown directory collisions
+ * wix: drop bin/ folder from MSI installers (issue2673)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
_service:recompress:download_url:mercurial-1.8.tar.bz2
New:
----
_service:recompress:download_url:mercurial-1.8.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mercurial.spec ++++++
--- /var/tmp/diff_new_pack.pnO1Wg/_old 2011-03-28 10:54:27.000000000 +0200
+++ /var/tmp/diff_new_pack.pnO1Wg/_new 2011-03-28 10:54:27.000000000 +0200
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
@@ -28,21 +27,12 @@
%endif
Name: mercurial
-BuildRequires: gcc python-devel python-xml
-%if 0%{?with_doc}
-BuildRequires: asciidoc docutils sgml-skel xmlto
-%endif
-BuildRequires: perl
-%if 0%{?suse_version} > 1020
-BuildRequires: fdupes
-%endif
Summary: Scalable Distributed SCM
-Version: 1.8
+Version: 1.8.1
Release: 1
License: GPLv2+
Group: Development/Tools/Version Control
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Url: http://www.selenic.com/mercurial/
+Url: http://mercurial.selenic.com/
# http://mercurial.selenic.com/release/mercurial-%{version}.tar.gz
Source: %{name}-%{version}.tar.bz2
Source1: cacerts.rc
@@ -50,6 +40,15 @@
Patch: mercurial-hgk-path-fix.diff
Patch1: mercurial-sle10-inotify-fixes.diff
Patch2: mercurial-docutils-compat.diff
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: gcc python-devel python-xml
+%if 0%{?with_doc}
+BuildRequires: asciidoc docutils sgml-skel xmlto
+%endif
+BuildRequires: perl
+%if 0%{?suse_version} > 1020
+BuildRequires: fdupes
+%endif
# hgext/hgcia needs python-xml
Requires: python-xml
# require rcs for 3-way "merge" command.
++++++ _service ++++++
--- /var/tmp/diff_new_pack.pnO1Wg/_old 2011-03-28 10:54:27.000000000 +0200
+++ /var/tmp/diff_new_pack.pnO1Wg/_new 2011-03-28 10:54:27.000000000 +0200
@@ -1,4 +1,11 @@
<services>
- <service name="download_url"><param name="path">/release/mercurial-1.8.tar.gz</param><param name="host">mercurial.selenic.com</param></service>
- <service name="recompress"><param name="file">_service:download_url:mercurial-1.8.tar.gz</param><param name="compression">bz2</param></service>
+ <service name="download_url">
+ <param name="protocol">http</param>
+ <param name="host">mercurial.selenic.com</param>
+ <param name="path">/release/mercurial-1.8.1.tar.gz</param>
+ </service>
+ <service name="recompress">
+ <param name="file">_service:download_url:mercurial-1.8.1.tar.gz</param>
+ <param name="compression">bz2</param>
+ </service>
</services>
++++++ _service:recompress:download_url:mercurial-1.8.tar.bz2 -> _service:recompress:download_url:mercurial-1.8.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-1.8/.hgsigs new/mercurial-1.8.1/.hgsigs
--- old/mercurial-1.8/.hgsigs 2011-03-01 23:01:38.000000000 +0100
+++ new/mercurial-1.8.1/.hgsigs 2011-03-10 18:30:38.000000000 +0100
@@ -34,3 +34,4 @@
e3bf16703e2601de99e563cdb3a5d50b64e6d320 0 iD8DBQBNH8WqywK+sNU5EO8RAiQTAJ9sBO+TeiGro4si77VVaQaA6jcRUgCfSA28dBbjj0oFoQwvPoZjANiZBH8=
a6c855c32ea081da3c3b8ff628f1847ff271482f 0 iD8DBQBNSJJ+ywK+sNU5EO8RAoJaAKCweDEF70fu+r1Zn7pYDXdlk5RuSgCeO9gK/eit8Lin/1n3pO7aYguFLok=
2b2155623ee2559caf288fd333f30475966c4525 0 iD8DBQBNSJeBywK+sNU5EO8RAm1KAJ4hW9Cm9nHaaGJguchBaPLlAr+O3wCgqgmMok8bdAS06N6PL60PSTM//Gg=
+2616325766e3504c8ae7c84bd15ee610901fe91d 0 iD8DBQBNbWy9ywK+sNU5EO8RAlWCAJ4mW8HbzjJj9GpK98muX7k+7EvEHwCfaTLbC/DH3QEsZBhEP+M8tzL6RU4=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-1.8/.hgtags new/mercurial-1.8.1/.hgtags
--- old/mercurial-1.8/.hgtags 2011-03-01 23:01:38.000000000 +0100
+++ new/mercurial-1.8.1/.hgtags 2011-03-10 18:30:38.000000000 +0100
@@ -46,3 +46,4 @@
e3bf16703e2601de99e563cdb3a5d50b64e6d320 1.7.3
a6c855c32ea081da3c3b8ff628f1847ff271482f 1.7.4
2b2155623ee2559caf288fd333f30475966c4525 1.7.5
+2616325766e3504c8ae7c84bd15ee610901fe91d 1.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-1.8/PKG-INFO new/mercurial-1.8.1/PKG-INFO
--- old/mercurial-1.8/PKG-INFO 2011-03-01 23:01:50.000000000 +0100
+++ new/mercurial-1.8.1/PKG-INFO 2011-03-10 18:30:49.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: mercurial
-Version: 1.8
+Version: 1.8.1
Summary: Scalable distributed SCM
Home-page: http://mercurial.selenic.com/
Author: Matt Mackall
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-1.8/contrib/mergetools.hgrc new/mercurial-1.8.1/contrib/mergetools.hgrc
--- old/mercurial-1.8/contrib/mergetools.hgrc 2011-03-01 23:01:28.000000000 +0100
+++ new/mercurial-1.8.1/contrib/mergetools.hgrc 2011-03-10 18:30:30.000000000 +0100
@@ -3,6 +3,7 @@
[merge-tools]
kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
kdiff3.regkey=Software\KDiff3
+kdiff3.regkeyalt=Software\Wow6432Node\KDiff3
kdiff3.regappend=\kdiff3.exe
kdiff3.fixeol=True
kdiff3.gui=True
@@ -10,6 +11,7 @@
gvimdiff.args=--nofork -d -g -O $local $other $base
gvimdiff.regkey=Software\Vim\GVim
+gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
gvimdiff.regname=path
gvimdiff.priority=-9
@@ -36,6 +38,7 @@
xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child
diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
+diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\
diffmerge.regname=Location
diffmerge.priority=-7
diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
@@ -45,6 +48,7 @@
p4merge.args=$base $local $other $output
p4merge.regkey=Software\Perforce\Environment
+p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment
p4merge.regname=P4INSTROOT
p4merge.regappend=\p4merge.exe
p4merge.gui=True
@@ -53,6 +57,7 @@
tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
tortoisemerge.regkey=Software\TortoiseSVN
+tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
tortoisemerge.checkchanged=True
tortoisemerge.gui=True
tortoisemerge.priority=-8
@@ -60,6 +65,7 @@
ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
+ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
ecmerge.gui=True
ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'
@@ -84,6 +90,7 @@
winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output
winmerge.regkey=Software\Thingamahoochie\WinMerge
+winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
winmerge.regname=Executable
winmerge.checkchanged=True
winmerge.gui=True
@@ -106,6 +113,7 @@
diffuse.diffargs=$parent $child
UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
+UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
UltraCompare.args = $base $local $other -title1 base -title3 other
UltraCompare.priority = -2
UltraCompare.gui = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-1.8/contrib/wix/guids.wxi new/mercurial-1.8.1/contrib/wix/guids.wxi
--- old/mercurial-1.8/contrib/wix/guids.wxi 2011-03-01 23:01:28.000000000 +0100
+++ new/mercurial-1.8.1/contrib/wix/guids.wxi 2011-03-10 18:30:30.000000000 +0100
@@ -47,6 +47,5 @@
<?define paths.rc.guid = {F9ADF21D-5F0B-4934-8CD9-14BE63664721} ?>
<?define cacert.pem.guid = {EC1B2630-FE21-46E6-915B-A6545AF703D4} ?>
<?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?>
- <?define hgcmd.guid = {65CCC756-E72E-4C5F-901E-D575EDC80DB3} ?>
</Include>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-1.8/contrib/wix/mercurial.wxs new/mercurial-1.8.1/contrib/wix/mercurial.wxs
--- old/mercurial-1.8/contrib/wix/mercurial.wxs 2011-03-01 23:01:28.000000000 +0100
+++ new/mercurial-1.8.1/contrib/wix/mercurial.wxs 2011-03-10 18:30:30.000000000 +0100
@@ -62,7 +62,7 @@
<Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)' Win64='$(var.IsX64)'>
<File Id='hgEXE' Name='hg.exe' Source='dist\hg.exe' KeyPath='yes' />
fi }
- $ echo "[extensions]" >> $HGRCPATH - $ echo "mq =" >> $HGRCPATH - $ echo "[mq]" >> $HGRCPATH - $ echo "git = keep" >> $HGRCPATH - Commit two dummy files in "init" changeset: $ hg init t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-1.8/tests/test-newbranch.t new/mercurial-1.8.1/tests/test-newbranch.t --- old/mercurial-1.8/tests/test-newbranch.t 2011-03-01 23:01:29.000000000 +0100 +++ new/mercurial-1.8.1/tests/test-newbranch.t 2011-03-10 18:30:31.000000000 +0100 @@ -209,11 +209,12 @@ $ hg branch foo $ hg commit -m'Merge ff into foo' - created new head $ hg parents - changeset: 6:6af8030670c9 + changeset: 6:917eb54e1b4b branch: foo tag: tip + parent: 4:98d14f698afe + parent: 5:6683a60370cb user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Merge ff into foo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-1.8/tests/test-push-warn.t new/mercurial-1.8.1/tests/test-push-warn.t --- old/mercurial-1.8/tests/test-push-warn.t 2011-03-01 23:01:29.000000000 +0100 +++ new/mercurial-1.8.1/tests/test-push-warn.t 2011-03-10 18:30:31.000000000 +0100 @@ -413,7 +413,6 @@ (branch merge, don't forget to commit) $ hg -R k ci -m merge - created new head $ hg -R k push -r a j pushing to j diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-1.8/tests/test-rebase-conflicts.t new/mercurial-1.8.1/tests/test-rebase-conflicts.t --- old/mercurial-1.8/tests/test-rebase-conflicts.t 2011-03-01 23:01:29.000000000 +0100 +++ new/mercurial-1.8.1/tests/test-rebase-conflicts.t 2011-03-10 18:30:31.000000000 +0100 @@ -65,7 +65,7 @@ Try to continue without solving the conflict: $ hg rebase --continue - abort: unresolved merge conflicts (see hg resolve) + abort: unresolved merge conflicts (see hg help resolve) [255] Conclude rebase: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-1.8/tests/test-subrepo-git.t new/mercurial-1.8.1/tests/test-subrepo-git.t --- old/mercurial-1.8/tests/test-subrepo-git.t 2011-03-01 23:01:30.000000000 +0100 +++ new/mercurial-1.8.1/tests/test-subrepo-git.t 2011-03-10 18:30:31.000000000 +0100 @@ -314,6 +314,26 @@ cloning subrepo s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved +Don't crash if the subrepo is missing + + $ hg clone t missing -q + $ cd missing + $ rm -rf s + $ hg status -S + $ hg sum | grep commit + commit: 1 subrepos + $ hg push -q + abort: subrepo s is missing + [255] + $ hg commit -qm missing + abort: subrepo s is missing + [255] + $ hg update -C + cloning subrepo s + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg sum | grep commit + commit: (clean) + Check hg update --clean $ cd $TESTTMP/ta $ echo > s/g ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de