1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
<html>
<head>
<title>Arbitrary Patching with delta-patch</title>
</head>
<body>
<a name="Arbitrary_Patching_with_delta-patch"></a>
<a href="http://www.regexps.com">The Hackerlab at <code>regexps.com</code></a>
<h2 align=center>Arbitrary Patching with delta-patch</h2>
<small>
<b>up: </b><a href="arch.html#arch">arch</a></br>
<b>next: </b><a href="reconciling.html#Multi-Branch_Merging_--_The_reconcile_Command">Multi-Branch Merging -- The reconcile Command</a></br>
<b>prev: </b><a href="logs-after-merging.html#Writing_Log_Entries_for_Merges">Writing Log Entries for Merges</a></br>
</small>
<br>
<p><a name="index-pt:0"></a>
</p><p>A general purpose, though low-level tool for merging is the
<code>delta-patch</code>
command:
</p><pre>
% larch delta-patch FROM TO UPON OUTPUT-DIR
</pre>
<p>computes a patch set from <code>FROM</code>
to <code>TO</code>
and applies that patch set to
<code>UPON</code>
storing the result in <code>OUTPUT-DIR</code>
.
</p><p>The arguments <code>FROM</code>
, <code>TO</code>
, and <code>UPON</code>
can be the names of (any)
revision, or the directory names of project trees.
</p><p>If <code>UPON</code>
is a project tree, you can modify that tree directly with
the <code>--in-place</code>
option:
</p><pre>
% larch delta-patch --in-place FROM TO UPON
</pre>
<p><strong><u>Note:</u></strong> You pretty much have to know what you're doing to use this
command. Normally, you should use <code>star-merge</code>
, <code>update</code>
or <code>replay</code>
.
</p>
<small><i>arch: The arch Revision Control System
</i></small><br>
<a href="http://www.regexps.com">The Hackerlab at <code>regexps.com</code></a>
</body>
|
