You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Garrett Rooney <ro...@electricjellyfish.net> on 2008/03/12 14:16:49 UTC
Re: svn commit: r29867 - in branches/in-memory-cache: . build build/win32 contrib/client-side contrib/client-side/svnmerge notes subversion/libsvn_client subversion/libsvn_fs_base subversion/libsvn_ra_serf subversion/libsvn_repos subversion/po subver
On Tue, Mar 11, 2008 at 8:33 PM, Daniel L. Rall <dl...@finemaltcoding.com> wrote:
> On Tue, 11 Mar 2008, glasser@tigris.org wrote:
>
> > Author: glasser
> > Date: Tue Mar 11 17:19:48 2008
> > New Revision: 29867
> >
> > Log:
> > Merge some revisions from trunk to the in-memory-cache branch. I
> > don't really care which revisions they are, since we have merge
> > tracking now.
> ...
>
> WOOO! Awesome. :-)
+1
Is there any indication of the revs merged (say, the update to the
merge tracking properties) in the commit mail though? I looked
through and couldn't see them. Would be somewhat useful to be able to
figure that out somehow.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r29867 - in branches/in-memory-cache: . build build/win32 contrib/client-side contrib/client-side/svnmerge notes subversion/libsvn_client subversion/libsvn_fs_base subversion/libsvn_ra_serf subversion/libsvn_repos subversion/po subver
Posted by Mark Phippard <ma...@gmail.com>.
On Wed, Mar 12, 2008 at 10:16 AM, Garrett Rooney
<ro...@electricjellyfish.net> wrote:
> On Tue, Mar 11, 2008 at 8:33 PM, Daniel L. Rall <dl...@finemaltcoding.com> wrote:
> > On Tue, 11 Mar 2008, glasser@tigris.org wrote:
> >
> > > Author: glasser
> > > Date: Tue Mar 11 17:19:48 2008
> > > New Revision: 29867
> > >
> > > Log:
> > > Merge some revisions from trunk to the in-memory-cache branch. I
> > > don't really care which revisions they are, since we have merge
> > > tracking now.
> > ...
> >
> > WOOO! Awesome. :-)
>
> +1
>
> Is there any indication of the revs merged (say, the update to the
> merge tracking properties) in the commit mail though? I looked
> through and couldn't see them. Would be somewhat useful to be able to
> figure that out somehow.
The diff of a revision should show the merged revisions in the
property output. It should even be custom output and not a raw diff.
$ svn diff -c 29867 --depth=empty
http://svn.collab.net/repos/svn/branches/in-memory-cache
Property changes on: .
___________________________________________________________________
Added: svn:mergeinfo
Merged /trunk:r29755-29866
--
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
Re: svn commit: r29867 - in branches/in-memory-cache: . build build/win32
contrib/client-side contrib/client-side/svnmerge notes subversion/libsvn_client
subversion/libsvn_fs_base subversion/libsvn_ra_serf subversion/libsvn_repos
subversion/po subver
Posted by "C. Michael Pilato" <cm...@collab.net>.
Garrett Rooney wrote:
> On Tue, Mar 11, 2008 at 8:33 PM, Daniel L. Rall <dl...@finemaltcoding.com> wrote:
>> On Tue, 11 Mar 2008, glasser@tigris.org wrote:
>>
>> > Author: glasser
>> > Date: Tue Mar 11 17:19:48 2008
>> > New Revision: 29867
>> >
>> > Log:
>> > Merge some revisions from trunk to the in-memory-cache branch. I
>> > don't really care which revisions they are, since we have merge
>> > tracking now.
>> ...
>>
>> WOOO! Awesome. :-)
>
> +1
>
> Is there any indication of the revs merged (say, the update to the
> merge tracking properties) in the commit mail though? I looked
> through and couldn't see them. Would be somewhat useful to be able to
> figure that out somehow.
Yeah, if mailer.py sent propdiffs, we'd be in good shape. Someone wrote a
patch for that, but it was mired in a hundred levels of additional (and IMO,
unnecessary) complexity.
It would be nice hack in a basic check of the topmost committed directory
for mergeinfo changes, though. I'm happy to attempt as much, but need to
deal with 1.5 bugs first.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand