You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Nik Clayton <ni...@ngo.org.uk> on 2007/01/17 18:30:26 UTC
Merging to/from branches (was Re: svn commit: r23056 - in branches/perl-bindings-improvements:
. subversion/bindings/swig/perl/native)
David Glasser wrote:
> On 1/17/07, John Peacock <jp...@rowman.com> wrote:
>> > I think it might be better to push to the repository with svk's
>> > --verbatim to avoid this line in the log messages.
>>
>> Agreed. That was my first "push" to the repository, so I'll know better
>> next time. Do you think it is worthwhile revising the log entry?
>
> Yeah, probably should. (I think clkao and I have gone the "log
> messages must look like everybody else's, but svk:merge tickets are OK
> to push" route.)
That brings up something I was going to ask.
What's the approved way to merge from trunk to a branch? I looked through
hacking.html and didn't see anything in there about it. I assume the
project has standards for that sort of thing.
N
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging to/from branches (was Re: svn commit: r23056 - in branches/perl-bindings-improvements:
. subversion/bindings/swig/perl/native)
Posted by John Peacock <jp...@rowman.com>.
Daniel Rall wrote:
> FWIW, I personally have nothing against y'all using svk instead of
> svnmerge.py. While svnmerge.py is light-weight and has consensus as
> our "standard" for the time being, it certainly isn't the only tool
> capable of handling the job. You and Nik are likely to be the only
> ones doing merges into the branch; it doesn't make sense to me to get
> in the way of your preferred tool set.
Then I'll just discuss that offline with Nik, because we should both be
able to resync the branch from trunk, and I don't want to "cross the
streams."[1]
John
1. http://us.imdb.com/title/tt0087332/quotes
--
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD 20706
301-459-3366 x.5010
fax 301-429-5748
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging to/from branches (was Re: svn commit: r23056 - in branches/perl-bindings-improvements: . subversion/bindings/swig/perl/native)
Posted by Daniel Rall <dl...@collab.net>.
On Wed, 17 Jan 2007, John Peacock wrote:
> Nik Clayton wrote:
> >What's the approved way to merge from trunk to a branch? I looked
> >through hacking.html and didn't see anything in there about it. I
> >assume the project has standards for that sort of thing.
>
> Since I'm using SVK, I was planning on letting SVK handle it for me.
> Actually, since I have a local branch where I'm actually working, I'd
> have to smerge from trunk to branch, then 'up -sm' to my local branch.
FWIW, I personally have nothing against y'all using svk instead of
svnmerge.py. While svnmerge.py is light-weight and has consensus as
our "standard" for the time being, it certainly isn't the only tool
capable of handling the job. You and Nik are likely to be the only
ones doing merges into the branch; it doesn't make sense to me to get
in the way of your preferred tool set.
Re: Merging to/from branches (was Re: svn commit: r23056 - in branches/perl-bindings-improvements: . subversion/bindings/swig/perl/native)
Posted by Daniel Rall <dl...@collab.net>.
On Thu, 18 Jan 2007, John Peacock wrote:
> Nik Clayton wrote:
> > Is that likely for this branch? I'm envisaging that we'll be doing
> > cleanups and new work that can be merged in discrete lumps into trunk/.
> > So the branch might be quite long lived, with repeated merges back to
> > trunk/.
>
> If Nik and I want to use SVK for the repeated merges from trunk to branch, then
> we can just as simply use SVK to provide the merge to trunk in the form of a
> diff file for Daniel to commit. Alternatively, if he is willing to just read
> the diff and give his blessing, as partial committers we can commit to the trunk
> with his ID on the "Approved by" line.
>
> I'm also OK with using svnmerge.py for all interactions with the trunk code.
> It's really up to you Daniel...
I don't have any problem with using svk to merge to trunk. There's
already some svk meta data in subversion's repository, so there's
precedent for this.
Re: Merging to/from branches (was Re: svn commit: r23056 - in branches/perl-bindings-improvements:
. subversion/bindings/swig/perl/native)
Posted by John Peacock <jp...@rowman.com>.
Nik Clayton wrote:
> Is that likely for this branch? I'm envisaging that we'll be doing
> cleanups and new work that can be merged in discrete lumps into trunk/.
> So the branch might be quite long lived, with repeated merges back to
> trunk/.
If Nik and I want to use SVK for the repeated merges from trunk to branch, then
we can just as simply use SVK to provide the merge to trunk in the form of a
diff file for Daniel to commit. Alternatively, if he is willing to just read
the diff and give his blessing, as partial committers we can commit to the trunk
with his ID on the "Approved by" line.
I'm also OK with using svnmerge.py for all interactions with the trunk code.
It's really up to you Daniel...
John
--
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Blvd
Suite H
Lanham, MD 20706
301-459-3366 x.5010
fax 301-429-5747
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging to/from branches (was Re: svn commit: r23056 - in branches/perl-bindings-improvements:
. subversion/bindings/swig/perl/native)
Posted by Nik Clayton <ni...@ngo.org.uk>.
Daniel Rall wrote:
> On Wed, 17 Jan 2007, Nik Clayton wrote:
>> I'm using SVK too, and it's great. But I'm wary of getting in to a
>> situation where we've made a bunch of merges with SVK and then start
>> needing to use svnmerge.py to merge things back.
>
> As far as Subversion's own development goes, we've only been using
> svnmerge.py for one-way synchronization (trunk -> branch). Merges
> back into trunk have been via vanilla 'svn merge', since such a merge
> has typically meant that the branch is at EOL and will be deleted
> after the merge, so there's no reason to retain merge info for the
> branch (since no subsequent merges with it as a merge source will
> occur).
Is that likely for this branch? I'm envisaging that we'll be doing cleanups
and new work that can be merged in discrete lumps into trunk/. So the
branch might be quite long lived, with repeated merges back to trunk/.
N
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging to/from branches (was Re: svn commit: r23056 - in branches/perl-bindings-improvements: . subversion/bindings/swig/perl/native)
Posted by Daniel Rall <dl...@collab.net>.
On Wed, 17 Jan 2007, Nik Clayton wrote:
> John Peacock wrote:
> >Nik Clayton wrote:
> >>What's the approved way to merge from trunk to a branch? I looked
> >>through hacking.html and didn't see anything in there about it. I
> >>assume the project has standards for that sort of thing.
> >
> >Since I'm using SVK, I was planning on letting SVK handle it for me.
> >Actually, since I have a local branch where I'm actually working, I'd
> >have to smerge from trunk to branch, then 'up -sm' to my local branch.
>
> Is this going to cause us problems in the future when we want to merge
> from the branch back to the trunk?
>
> I'm using SVK too, and it's great. But I'm wary of getting in to a
> situation where we've made a bunch of merges with SVK and then start
> needing to use svnmerge.py to merge things back.
As far as Subversion's own development goes, we've only been using
svnmerge.py for one-way synchronization (trunk -> branch). Merges
back into trunk have been via vanilla 'svn merge', since such a merge
has typically meant that the branch is at EOL and will be deleted
after the merge, so there's no reason to retain merge info for the
branch (since no subsequent merges with it as a merge source will
occur).
So no, use of SVK for keeping your branch up to date with trunk
shouldn't cause any problems down the road.
- Dan
Re: Merging to/from branches (was Re: svn commit: r23056 - in branches/perl-bindings-improvements:
. subversion/bindings/swig/perl/native)
Posted by Nik Clayton <ni...@ngo.org.uk>.
John Peacock wrote:
> Nik Clayton wrote:
>> What's the approved way to merge from trunk to a branch? I looked
>> through hacking.html and didn't see anything in there about it. I
>> assume the project has standards for that sort of thing.
>
> Since I'm using SVK, I was planning on letting SVK handle it for me.
> Actually, since I have a local branch where I'm actually working, I'd
> have to smerge from trunk to branch, then 'up -sm' to my local branch.
Is this going to cause us problems in the future when we want to merge
from the branch back to the trunk?
I'm using SVK too, and it's great. But I'm wary of getting in to a
situation where we've made a bunch of merges with SVK and then start
needing to use svnmerge.py to merge things back.
N
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging to/from branches (was Re: svn commit: r23056 - in branches/perl-bindings-improvements:
. subversion/bindings/swig/perl/native)
Posted by John Peacock <jp...@rowman.com>.
Nik Clayton wrote:
> What's the approved way to merge from trunk to a branch? I looked
> through hacking.html and didn't see anything in there about it. I
> assume the project has standards for that sort of thing.
Since I'm using SVK, I was planning on letting SVK handle it for me.
Actually, since I have a local branch where I'm actually working, I'd
have to smerge from trunk to branch, then 'up -sm' to my local branch.
John
--
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD 20706
301-459-3366 x.5010
fax 301-429-5748
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging to/from branches (was Re: svn commit: r23056 - in branches/perl-bindings-improvements: . subversion/bindings/swig/perl/native)
Posted by Daniel Rall <dl...@collab.net>.
On Wed, 17 Jan 2007, Nik Clayton wrote:
> David Glasser wrote:
> >On 1/17/07, John Peacock <jp...@rowman.com> wrote:
> >>> I think it might be better to push to the repository with svk's
> >>> --verbatim to avoid this line in the log messages.
> >>
> >>Agreed. That was my first "push" to the repository, so I'll know better
> >>next time. Do you think it is worthwhile revising the log entry?
> >
> >Yeah, probably should. (I think clkao and I have gone the "log
> >messages must look like everybody else's, but svk:merge tickets are OK
> >to push" route.)
>
> That brings up something I was going to ask.
>
> What's the approved way to merge from trunk to a branch? I looked through
> hacking.html and didn't see anything in there about it. I assume the
> project has standards for that sort of thing.
We've started using svnmerge.py for merges from trunk to feature and
release branches.
This is not described in HACKING, but should be.
After the 1.5.0 release, we'll have basic Merge Tracking support in
Subversion, and will start using that.
- Dan