bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
1563.2.12
by Robert Collins
Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile. |
1 |
# Copyright (C) 2005 by Canonical Ltd
|
2 |
#
|
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
"""Test reweave code.
|
|
18 |
||
19 |
Reweave takes two weaves containing a partial view of history and combines
|
|
20 |
them into a single weave containing all the information. This can include
|
|
21 |
||
22 |
- versions recorded in only one file
|
|
23 |
||
24 |
- versions with different (but not contradictory) lists of parent
|
|
25 |
revisions
|
|
26 |
||
27 |
It is an error if either of these conditions occur:
|
|
28 |
||
29 |
- contradictory ancestry graphs, e.g.
|
|
30 |
- v1 is an ancestor of v2 in one weave, and vice versa in the other
|
|
31 |
- different text for any version
|
|
32 |
"""
|
|
33 |
||
34 |
import os |
|
35 |
import sys |
|
36 |