[Svnmerge] svnmerge and status --show-updates

[Giovanni Bajo]

Archie Cobbs wrote:

>> That's exactly how it works now. You can use --force to ignore local
>> modifications.
>>
>> The currente state of thing with respect to local modifications is
>> fine to me. What I don't understand is the check for pending updates.
>
> OK, now I understand. Yes it does seem superfluous... it's fine with
> me to get rid of it.

Done:

------------------------------------------------------------------------
r19646 | giovannibajo | 2006-05-15 20:05:13 +0200 (Mon, 15 May 2006) | 17
lines

As discussed on the svnmerge mailing list, there is no actual reason to
block
a merge just because there are pending updates on the repository. A merge
does not do any commit, it just modifies the working copy. And it is normal
to perform updates before committing. Also, the check is actually
meaningless,
because by the time the merge is finished, it might well be that there are
new pending updates on the repository.

It makes sense, instead, to make sure the working copy is clean, so not to
mistakenly commit unrelated modifies together with a merge. This check can
be disabled with --force.

A nice side effect of this patch is that it speeds out merge operations as
one less server/client round-trip is required.

 * contrib/client-side/svnmerge.py:
   (check_dir_clean): Do not check for pending updates.

------------------------------------------------------------------------

-- 
Giovanni Bajo