1
# Copyright (C) 2005 by Canonical Ltd
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.
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.
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
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
22
- versions recorded in only one file
24
- versions with different (but not contradictory) lists of parent
27
It is an error if either of these conditions occur:
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