Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/mercurial/patches/magic.patch
changeset 196 816e398e992c
parent 151 f9e42a3f7095
child 3596 042f4e7a6dbe 
--- a/components/mercurial/patches/magic.patch	Wed Apr 20 15:21:00 2011 -0700
+++ b/components/mercurial/patches/magic.patch	Fri Apr 01 09:53:52 2011 -0700
@@ -1,24 +1,56 @@
---- mercurial-1.3.1/contrib/hg-relink.orig	Thu Mar 24 21:42:58 2011
-+++ mercurial-1.3.1/contrib/hg-relink	Thu Mar 24 21:44:18 2011
+--- mercurial-1.8.2/contrib/check-code.py.orig	Fri Apr  1 10:41:52 2011
++++ mercurial-1.8.2/contrib/check-code.py	Fri Apr  1 11:10:58 2011
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python2.6
  #
- # Copyright (C) 2007 Brendan Cully <[email protected]>
+ # check-code - a style and portability checker for Mercurial
  #
---- mercurial-1.3.1/contrib/hgdiff.orig	Thu Mar 24 21:43:35 2011
-+++ mercurial-1.3.1/contrib/hgdiff	Thu Mar 24 21:44:23 2011
+--- mercurial-1.8.2/contrib/convert-repo.orig	Fri Apr  1 10:41:52 2011
++++ mercurial-1.8.2/contrib/convert-repo	Fri Apr  1 11:11:01 2011
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python2.6
+ #
+ # Wrapper script around the convert.py hgext extension
+ # for foreign SCM conversion to mercurial format.
+--- mercurial-1.8.2/contrib/dumprevlog.orig	Fri Apr  1 10:41:52 2011
++++ mercurial-1.8.2/contrib/dumprevlog	Fri Apr  1 11:11:03 2011
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+ # Dump revlogs as raw data stream
+ # $ find .hg/store/ -name "*.i" | xargs dumprevlog > repo.dump
  
- import os, sys, struct, stat
- import difflib
---- mercurial-1.3.1/contrib/hg-ssh.orig	Thu Mar 24 21:47:46 2011
-+++ mercurial-1.3.1/contrib/hg-ssh	Thu Mar 24 21:47:58 2011
+--- mercurial-1.8.2/contrib/hg-ssh.orig	Fri Apr  1 10:41:52 2011
++++ mercurial-1.8.2/contrib/hg-ssh	Fri Apr  1 11:11:05 2011
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python2.6
  #
  # Copyright 2005-2007 by Intevation GmbH <[email protected]>
  #
+--- mercurial-1.8.2/contrib/hgweb.fcgi.orig	Fri Apr  1 10:41:52 2011
++++ mercurial-1.8.2/contrib/hgweb.fcgi	Fri Apr  1 11:11:07 2011
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+ #
+ # An example FastCGI script for use with flup, edit as necessary
+ 
+--- mercurial-1.8.2/contrib/simplemerge.orig	Fri Apr  1 10:41:52 2011
++++ mercurial-1.8.2/contrib/simplemerge	Fri Apr  1 11:11:08 2011
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+ 
+ from mercurial import demandimport
+ demandimport.enable()
+--- mercurial-1.8.2/contrib/undumprevlog.orig	Fri Apr  1 10:41:52 2011
++++ mercurial-1.8.2/contrib/undumprevlog	Fri Apr  1 11:11:10 2011
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+ # Undump a dump from dumprevlog
+ # $ hg init
+ # $ undumprevlog < repo.dump
upstream/oracle/userland-gate