On 8/2/07, Eric Gillespie <epg@pretzelnet.org> wrote:
> A common use case is to merge the changes between two tags:
>
> 0 branch-from-tag1% svn merge $r/tag1 $r/tag2
> --- Merging r8:
> U file1
>
> I have included a dump of this test repository at the end of this
> message. tag1 is copied from trunk@1 in r2, tag2 is copied from
> trunk@4 in r5, and branch-from-tag1 is copied from tag1@4 (same
> as tag1@2). At the time I run this command, HEAD is 8 and the wc
> is fully updated to 8.
>
> The merge is correct; commit and diff $r/tag2 $r/branch-from-tag1
> to prove that. But I think the reporting is off. Conceptually,
> this is the same as 'svn merge -r2:4 $r/trunk' and r8 isn't
> involved at all. I know and you know that we referred to tag1
> and tag2 as of r8, but even though I understand that, I still
> find this output highly misleading. This I expect:
>
> 0 branch-from-trunk% svn merge -c 8 $r/trunk
> --- Merging r8:
> U file1
>
> "Merging r8" is not at all what I expect from the earlier
> command, though. We could print something like
>
> --- Merging tag1@r8 tag2@r8
>
> but I'm not sure that's useful either. Maybe we should just not
> print a --- Merging line at all.
>
> I made a small change libsvn_client/merge.c to play with:
I had to read this a few times to understand it, but once I did I have
to say I agree with you. The current notification is just not right
or of any value. If someone can come up with a reasonable idea for a
notification that adds some value that would be good, but otherwise
I'd say just no notification.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 3 02:00:54 2007