|
|
825.
|
|
|
The assumed HEAD revision (%lu) of the hotcopy source has been packed while the hotcopy was in progress; please restart the hotcopy operation
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../libsvn_fs_fs/fs_fs.c:11360
|
|
|
1781.
|
|
|
discard update, mark resolved, the move will will become a copy
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/conflict-callbacks.c:549
|
|
|
1784.
|
|
|
keep affected local moves
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/conflict-callbacks.c:577 ../svn/conflict-callbacks.c:593
|
|
|
1785.
|
|
|
keep any local moves affected by this deletion [mine-conflict]
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/conflict-callbacks.c:577
|
|
|
1786.
|
|
|
mark resolved (breaks moves)
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/conflict-callbacks.c:580 ../svn/conflict-callbacks.c:596
|
|
|
1787.
|
|
|
mark resolved, any affected moves will become copies
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/conflict-callbacks.c:580
|
|
|
1788.
|
|
|
keep any moves affected by this replacement [mine-conflict]
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/conflict-callbacks.c:593
|
|
|
1789.
|
|
|
mark resolved (any affected moves will become copies)
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/conflict-callbacks.c:596
|
|
|
2075.
|
|
|
Specify differencing options for external diff or 
internal diff or blame. Default: '-u'. Options are
separated by spaces. Internal diff and blame take:
-u, --unified: Show 3 lines of unified context
-b, --ignore-space-change: Ignore changes in
amount of white space
-w, --ignore-all-space: Ignore all white space
--ignore-eol-style: Ignore changes in EOL style
-p, --show-c-function: Show C function name |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/svn.c:191
|
|
|
2133.
|
|
|
Also commit file and dir externals reached by
recursion. This does not include externals with a
fixed revision. (See the svn:externals property) |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/svn.c:372
|
