You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Rall <dl...@finemaltcoding.com> on 2007/08/24 17:19:06 UTC
Output of merges to targets with sub-tree mergeinfo
On Aug 23, 2007, at 11:18 AM, David Glasser wrote:
> On 8/22/07, Paul Burba <pb...@collab.net> wrote:
>> Currently trunk behaves this way if we perform a merge that
>> affects only
>> a subtree:
>>
>>> svn merge %URL%/A merge_tests-1\A_COPY -c3
>> --- Merging r3:
>> --- Merging r3:
>> U merge_tests-1\A_COPY\D\H\psi
>> --- Merging r3:
>
> I'm not sure I am qualified to speak to the actual underlying
> mergeinfo issues here. But as far as UI is concerned, this output is
> somewhat strange, with the three "Merging r3:" lines. Maybe it would
> be more clear if the "--- Merging" lines mentioned the paths as well?
David, in general I tend to agree. For the particular case above,
I'm in violent agreement. How about this?
$ svn merge -c -26286 https://svn.collab.net/repos/svn/trunk/www www
--- Undoing r26286 for 'www':
See attached patch.
- Dan
Re: Output of merges to targets with sub-tree mergeinfo
Posted by Daniel Rall <dl...@collab.net>.
On Fri, 24 Aug 2007, David Glasser wrote:
> On 8/24/07, Daniel Rall <dl...@finemaltcoding.com> wrote:
> >
> > On Aug 23, 2007, at 11:18 AM, David Glasser wrote:
> >
> > > On 8/22/07, Paul Burba <pb...@collab.net> wrote:
> > >> Currently trunk behaves this way if we perform a merge that
> > >> affects only
> > >> a subtree:
> > >>
> > >>> svn merge %URL%/A merge_tests-1\A_COPY -c3
> > >> --- Merging r3:
> > >> --- Merging r3:
> > >> U merge_tests-1\A_COPY\D\H\psi
> > >> --- Merging r3:
> > >
> > > I'm not sure I am qualified to speak to the actual underlying
> > > mergeinfo issues here. But as far as UI is concerned, this output is
> > > somewhat strange, with the three "Merging r3:" lines. Maybe it would
> > > be more clear if the "--- Merging" lines mentioned the paths as well?
> >
> > David, in general I tend to agree. For the particular case above,
> > I'm in violent agreement. How about this?
> >
> > $ svn merge -c -26286 https://svn.collab.net/repos/svn/trunk/www www
> > --- Undoing r26286 for 'www':
> >
> > See attached patch.
>
> Sorry, I'm about to drive to Burning Man, so I think I'll just say I
> trust your taste :)
I committed the patch to trunk in r26647.
Re: Output of merges to targets with sub-tree mergeinfo
Posted by David Glasser <gl...@davidglasser.net>.
On 8/24/07, Daniel Rall <dl...@finemaltcoding.com> wrote:
>
> On Aug 23, 2007, at 11:18 AM, David Glasser wrote:
>
> > On 8/22/07, Paul Burba <pb...@collab.net> wrote:
> >> Currently trunk behaves this way if we perform a merge that
> >> affects only
> >> a subtree:
> >>
> >>> svn merge %URL%/A merge_tests-1\A_COPY -c3
> >> --- Merging r3:
> >> --- Merging r3:
> >> U merge_tests-1\A_COPY\D\H\psi
> >> --- Merging r3:
> >
> > I'm not sure I am qualified to speak to the actual underlying
> > mergeinfo issues here. But as far as UI is concerned, this output is
> > somewhat strange, with the three "Merging r3:" lines. Maybe it would
> > be more clear if the "--- Merging" lines mentioned the paths as well?
>
> David, in general I tend to agree. For the particular case above,
> I'm in violent agreement. How about this?
>
> $ svn merge -c -26286 https://svn.collab.net/repos/svn/trunk/www www
> --- Undoing r26286 for 'www':
>
> See attached patch.
Sorry, I'm about to drive to Burning Man, so I think I'll just say I
trust your taste :)
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org