[haiku-commits] Re: r41552 - haiku/branches/releases/r1alpha3/build/jam
- From: pulkomandy <pulkomandy@xxxxxxxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 17 May 2011 19:05:36 +0200
> I hope I did that right cencerning the alpha branch merging. For
> reference what I did was checking out the r1alpha3 branch of the
> directory I wanted to merge (in this case build/jam), merging in the
> trunk changes and commiting that. In commands:
>
> cd somewhere
>
> svn co
> svn+ssh://mmlr@xxxxxxxxxxxxxxxx/srv/svn/repos/haiku/haiku/branches/releases/r1alpha3/build/jam
>
> r1alpha3/build/jam
>
> svn merge -r 41550:41551
> svn+ssh://mmlr@xxxxxxxxxxxxxxxx/srv/svn/repos/haiku/haiku/trunk/build/jam
>
> svn diff
>
> svn status
>
> svn commit
>
> Note that the ssh username is encoded in the URLs. Would work the same
> for other directories, adapting the path and URLs, or just for the top
> directory directly if one wants to (and has the time to) do a full
> checkout of the alpha branch.
Looks ok. You can also use svn switch in your working repository to
swith a directory to another branch, merge, then switch back.
>
> > Property changes on: haiku/branches/releases/r1alpha3/build/jam
> > ___________________________________________________________________
> > Added: svn:mergeinfo
> > + /haiku/branches/developer/bonefish/signals/build/jam:40148-40195
> > /haiku/branches/developer/bonefish/weak-symbols/build/jam:39365-39568
> > /haiku/trunk/build/jam:41551
>
> Not sure if we need this mergeinfo, it got created automatically.
>
It allows tracking where the changeset comes from. It's used by svn when
merging something else to keep track of whant needs to be done. Not so
useful in alpha branches since these don't get merged back to trunk, but
it doesn't hurt either.
> Regards
> Michael
>
Other related posts:
