Browsing Spanish translation

597.

Node-revision #'%s' claims to have mergeinfo but doesn't

598.

Node-revision '%s@%ld' claims to have mergeinfo but doesn't

1115.

no parent with copyfrom information found above '%s'

1218.

Invalid %s property on '%s': cannot use two absolute URLs ('%s' and '%s') in an external; one must be a path where an absolute or relative URL is checked out to

1243.

Shallowing of working copy depths is not yet supported

1272.

Sorry, '(mc) mine for conflicts' is not yet implemented; see
http://subversion.tigris.org/issues/show_bug.cgi?id=3049

1402.

lump-merge all of source URL's unmerged changes

1424.

Show the log messages for a set of revision(s) and/or file(s).
usage: 1. log [PATH]
2. log URL[@REV] [PATH...]

1. Print the log messages for a local PATH (default: '.').
The default revision range is BASE:1.

2. Print the log messages for the PATHs (default: '.') under URL.
If specified, REV determines in which revision the URL is first
looked up, and the default revision range is REV:1; otherwise,
the URL is looked up in HEAD, and the default revision range is
HEAD:1.

With -v, also print all affected paths with each log message.
With -q, don't print the log message body itself (note that this is
compatible with -v).

Each log message is printed just once, even if more than one of the
affected paths for that revision were explicitly requested. Logs
follow copy history by default. Use --stop-on-copy to disable this
behavior, which can be useful for determining branchpoints.

Examples:
svn log
svn log foo.c
svn log http://www.example.com/repo/project/foo.c
svn log http://www.example.com/repo/project foo.c bar.c

1427.

Apply the differences between two sources to a working copy path.
usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]
3. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [WCPATH]

1. In the first form, the source URLs are specified at revisions
N and M. These are the two sources to be compared. The revisions
default to HEAD if omitted.

2. In the second form, the URLs corresponding to the source working
copy paths define the sources to be compared. The revisions must
be specified.

3. In the third form, SOURCE can be either a URL or a working copy
path (in which case its corresponding URL is used). SOURCE (in
revision REV) is compared as it existed between revisions N and M
for each revision range provided. If REV is not specified, HEAD
is assumed. '-c M' is equivalent to '-r <M-1>:M', and '-c -M'
does the reverse: '-r M:<M-1>'. If no revision ranges are
specified, the default range of 0:REV is used. Multiple '-c'
and/or '-r' instances may be specified, and mixing of forward
and reverse ranges is allowed.

WCPATH is the working copy path that will receive the changes.
If WCPATH is omitted, a default value of '.' is assumed, unless
the sources have identical basenames that match a file within '.':
in which case, the differences will be applied to that file.

NOTE: Subversion will only record metadata to track the merge
if the two sources are on the same line of history -- if the
first source is an ancestor of the second, or vice-versa. This is
guaranteed to be the case when using the third form listed above.
The --ignore-ancestry option overrides this, forcing Subversion to
regard the sources as unrelated and not to track the merge.

1428.

Display merge-related information.
usage: mergeinfo SOURCE[@REV] [TARGET[@REV]]

Display information related to merges (or potential merges) between
SOURCE and TARGET (default: '.'). If the --show-revs option
is not provided, display revisions which have been merged from
SOURCE to TARGET; otherwise, display the type of information
specified by the --show-revs option.