[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Merge revision range notification (circa r25249)

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-06-06 01:03:55 CEST

On Fri, 01 Jun 2007, Paul Burba wrote:

> Hi Ben,
> Two questions on this patch:
> 1) The utility main.merge_notify_line() checks the new merge range
> notifications when merging to a file target. But we don't check the
> notifications when merging into a directory (i.e.
> actions.run_and_verify_merge/run_and_verify_merge2() simply doesn't take
> them into account). So the new code in do_merge() is never actually
> tested. Did you look into making run_and_verify_merge() handle this?

I must've missed the answer to this one (IRC, I'm guessing).

> 2) In the case where a merge updates *only* svn:mergeinfo, we still
> print the range notifications, but nothing after them. For example:
> # Perform a merge which makes no changes to the WC
> >svn merge %URL%/A merge_tests-1\A_COPY -r3:5
> --- Merging revision 4:
> --- Merging revision 5:
> --- Merging revisions 4-5:
> I suppose this is better than what we did before, which was no output
> and a 'silent' change to the svn:mergeinfo props. At least it looks
> like something is happening now! So I suppose this is less of a
> question and just more of an observation.

Yah, this is a ton better than previous behavior. It's a little
strange that nothing comes after -- I'm not convinced, but we *could*
remove that colon (it might help?).

  • application/pgp-signature attachment: stored
Received on Wed Jun 6 01:04:17 2007

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.