Dealing with Renamed Directories

[Jamie Jackson]

I have a dozen outstanding feature branches (based on the trunk), and
I need to rename a subdirectory. Since I've got so many branches, I
want to make sure I'm doing things properly.

Here's how I plan to do this, and propagate the change to the branches:

TRUNK
1. Rename the directory (and commit).
2. Change any code to reflect the new directory name (and commit).

BRANCH
3. Merge in step 1.
4. Resolve the resulting tree conflict with "mine-full".
5. SVN rename the changed directory (and commit).
6. Merge in step 2 (and commit).

Is that the standard approach?

Notes:
 * I don't like how 1 and 2 are separate commits, but it seems inevitable.
 * 3-5 could be done with record-only-merge, but 3-5 seems to have the
advantage that the eventual branch-to-trunk merge will have this merge
revision ignored.

Thanks,
Jamie

Enhancement: Expose Merge Whitespace Options in JavaHL

[Jamie Jackson]

Hi Folks,

I'd like to file an enhancement request:

JavaHL doesn't seem to expose some necessary merge options. From the CLI:

  -x [--extensions] ARG: 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
   -U ARG, --context ARG: Show ARG lines of
context
   -p, --show-c-function: Show C function name

The differ seems to have the options:

https://subversion.a​pache.org/docs/javah​l/latest/org/apache/​subversion/javahl/SV​NUtil.DiffOptions.Ig​noreSpace.html#chang​e


...but as far as I know, merge does not.

The option I'm particularly interested in is --ignore-space-change.
TortoiseSVN, for instance, makes easy work of merges that involve lots of,
say, indentation changes; whereas in Java clients, there can be *loads* more
confusing/manual conflict editing, due to the reduced merge support in
JavaHL.

For what it's worth, here's a thread I started on the Subclipse mailing
list, before I was referred upstream to the Subversion project.

Thanks,
Jamie

Using Meld for Merge Conflicts

[Jamie Jackson]

I'm on Mac, and I thought I'd use Meld for merge conflicts. However,
this doesn't seem to work: http://stackoverflow.com/a/7418087.

What's the right way to do this with modern versions of SVN (1.9.5)
and Meld (3.16.0)?

Thanks,
Jamie