source: XMLIO_V2/tools/FCM/lib/Fcm/CLI/fcm-diff.pod @ 81

Last change on this file since 81 was 81, checked in by ymipsl, 14 years ago

ajout FCM 1.5
File size: 1.3 KB
Line 
1=head1 NAME
2
3fcm diff (di)
4
5=head1 SYNOPSIS
6
7    1. fcm diff --branch [OPTIONS] [TARGET]
8    2. fcm diff [OPTIONS] [ARGS]
9
10=over 4
11
12=item 1.
13
14Show differences relative to the base of the target branch, i.e. the changes
15available for merging from the target branch into its parent. If TARGET is
16specified, it must either be a URL or a working copy.  Otherwise, the target is
17the the current directory which must be a working copy. The target URL must be a
18branch in a standard FCM project.
19
20=item 2.
21
22See description of "L<svn|svn> diff" below.
23
24=back
25
26=head1 OPTIONS
27
28Valid options with --branch:
29
30=over 4
31
32=item --diff-cmd arg
33
34As described below in the help for "L<svn|svn> diff".
35
36=item -g [--graphical]
37
38As described below.
39
40=item --summarise
41
42As described below
43
44=item --summarize
45
46As described below in the help for "L<svn|svn> diff".
47
48=item -t [--trac]
49
50If TARGET is a URL, use Trac to display the diff.
51
52=item --wiki
53
54If TARGET is a URL, print Trac link for the diff.
55
56=item -x [--extensions] arg
57
58As described below in the help for "L<svn|svn> diff".
59
60=back
61
62Other options:
63
64=over 4
65
66=item -g [--graphical]
67
68Use a graphical diff tool to display the differences. This option should not be
69used in combination with --diff-cmd.
70
71=item --summarise
72
73Same as --summarize as described below.
74
75=back
76
77For other options, see output of "L<svn|svn> help diff".
78
79=cut
Note: See TracBrowser for help on using the repository browser.