equal
deleted
inserted
replaced
3 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> |
3 # Copyright 2006, 2007 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 |
6 # of the GNU General Public License, incorporated herein by reference. |
6 # of the GNU General Public License, incorporated herein by reference. |
7 |
7 |
8 from node import * |
8 from node import nullid, nullrev |
9 from i18n import _ |
9 from i18n import _ |
10 import errno, util, os, heapq, filemerge |
10 import errno, util, os, heapq, filemerge |
11 |
11 |
12 def checkunknown(wctx, mctx): |
12 def checkunknown(wctx, mctx): |
13 "check for collisions between unknown files and files in mctx" |
13 "check for collisions between unknown files and files in mctx" |