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

Re: [PATCH] Ruby bindings client for merge_peg

From: Joe Swatosh <joe.swatosh_at_gmail.com>
Date: 2007-08-14 16:43:08 CEST

Hi kou,

On 8/14/07, Kouhei Sutou <kou@cozmixng.org> wrote:
> Hi,
>
> > * subversion/bindings/swig/ruby/svn/client.rb
> > (Svn::Client::Context#merge_peg) make the peg_rev argument mandatory
> > instead of optional.
>
> > Index: subversion/bindings/swig/ruby/svn/client.rb
> > ===================================================================
> > --- subversion/bindings/swig/ruby/svn/client.rb (revision 26069)
> > +++ subversion/bindings/swig/ruby/svn/client.rb (working copy)
> > @@ -315,8 +315,8 @@
> > dry_run, options, self)
> > end
> >
> > - def merge_peg(src, rev1, rev2, target_wcpath,
> > - peg_rev=nil, depth=nil,
> > + def merge_peg(src, rev1, rev2, target_wcpath, peg_rev,
> > + depth=nil,
> > ignore_ancestry=false, force=false,
> > dry_run=false, options=nil, record_only=false)
> > Client.merge_peg3(src, rev1, rev2, peg_rev,
>
> Uhm... What about the following:
>
> def merge_peg(src, rev1, rev2, target_wcpath,
> peg_rev=nil, depth=nil, ...)
> peg_rev ||= rev2
> ...
>

I thought about that. To be honest I don't understand peg revisions
that well, but
it seemed like a method called merge_peg might reasonably require a peg revision
argument. So if this is a better solution we should just use it instead.....

--
Joe
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Aug 14 16:41:00 2007

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