Mercurial > hg
comparison mercurial/ancestor.py @ 8225:46293a0c7e9f
updated license to be explicit about GPL version 2
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 26 Apr 2009 01:08:54 +0200 |
parents | 8d78fc991b71 |
children | 23429ebd3f9d |
comparison
equal
deleted
inserted
replaced
8224:1075f5c1b3fa | 8225:46293a0c7e9f |
---|---|
1 # ancestor.py - generic DAG ancestor algorithm for mercurial | 1 # ancestor.py - generic DAG ancestor algorithm for mercurial |
2 # | 2 # |
3 # Copyright 2006 Matt Mackall <mpm@selenic.com> | 3 # Copyright 2006 Matt Mackall <mpm@selenic.com> |
4 # | 4 # |
5 # This software may be used and distributed according to the terms | 5 # This software may be used and distributed according to the terms of the |
6 # of the GNU General Public License, incorporated herein by reference. | 6 # GNU General Public License version 2, incorporated herein by reference. |
7 | 7 |
8 import heapq | 8 import heapq |
9 | 9 |
10 def ancestor(a, b, pfunc): | 10 def ancestor(a, b, pfunc): |
11 """ | 11 """ |