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

Re: Licensing on donated code in the Python bindings

From: <kfogel_at_collab.net>
Date: 2005-08-04 22:24:43 CEST

David James <james82@gmail.com> writes:
> > Hmm, I'm not sure I understand exactly what you're proposing -- could
> > you explain it in terms of the proposed branch and merge commands,
> > maybe, so there's no possible ambiguity?
> svn cp -r 15574 \
> http://svn.collab.net/repos/svn/branches/python-bindings-improvements \
> http://svn.collab.net/repos/svn/branches/python-memory-management
> This will mostly be a "tag", but I want to call it a branch so that
> I'll be able to fix bugs if necessary.

Now I'm more confused :-). Let me try restating what I think the goal
is, then you tell me if I'm on the right track.

The p-b-i branch is currently in a good, mergeable state right now,
and you don't want to interfere with that, because you know Ben Reser
is about to review it. But you also don't want to stop further
development. So, you want one branch for Ben to review, and another
on which you can keep working without interruption.

If this is the plan, let's use clear names to indicate it:

   1. Copy p-b-i to p-b-i-interim-for-review

   2. Continue working on p-b-i as before.

   3. Supply Ben Reser with the exact commands he'll need to review
      p-b-i-interim-for-review, to save him time.

   4. Any tweaks you make to p-b-i-i-f-r, make to p-b-i as well. If
      one absorbs any trunk changes or bugfixes, the other must absorb
      them as well, and vice versa, so that the difference between the
      two branches is always simply the further work done on the p-b-i

   5. If Ben wants to review p-b-i-i-f-r as well, he can, but it might
      be more efficient for him to just do p-b-i (or a subset thereof)
      and then we'll see where things stand.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 4 23:19:31 2005

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.