Re: [Discuss-gnuradio] svn merging etc

[Eric Blossom]

On Sat, Aug 05, 2006 at 12:13:58AM -0700, Johnathan Corgan wrote:
> Achilleas Anastasopoulos wrote:
> 
> > I was wondering if you can commit this change that
> > fixed the error also to my wip directory:
> > http://gnuradio.utah.edu/svn/gnuradio/branches/developers/anastas/wip/
> > since it does not yet compile with gcc3.4,
> > or is this something that I am supposed to do?
> 
> I hope you don't mind my copying the list as this is important
> information for other developers as well.
> 
> Ideally you'd be periodically merging changes on the trunk into your
> working copy, so you can see if there is any problem with what you're
> working on what's going on elsewhere.
> 
> If revision M is the version of the trunk that was originally copied
> into your developer branch, and N is the latest revision in the trunk,
> then the following command would accomplish this (you must be at the top
> of your working copy):
> 
> svn merge -rN:M http://gnuradio.utah.edu/svn/gnuradio/trunk
> 
> Your working copy will have all the stuff merged in; you'll need to
> verify there were no conflicts.  If there were, you'll need to fix them
> up.  Now you can check in your local copy with a log message indicating
> that you merged from trunk from revision M to revision N.
> 
> This latter is important to get in the log.  The next time you do a
> merge from the trunk, you'll want to start at the highest revision you
> last merged.  In the above case, this is revision M.  So having it in
> the log makes it easy for you to go check this.
> 
> If you just want to get the fix for ticket #11, use -r3171:3172 in the
> above command.  This may complicate your merging from the trunk at a
> later time as you'll have a -rN:M range that overlaps the above, and
> you'll get a reject for the affected files when it tries to apply the
> diff to something that it has already been applied to.
> 
> When you're ready to merge your wip stuff into the trunk, I'll walk you
> through that as it involves a different set of commands based on whether
> you've been periodically merging from the trunk into your wip or not.
> 
> -Johnathan

Johnanthan, FYI, I created the branch [probably bad form.]

Achilleas, I did create your account with the given password.

There's been a lot of work in trunk since the branch was checked out.
The branch only adds gr-trellis.  I think it would apply cleanly to
trunk, however it still doesn't automatically expand the templates, so
I don't think it's time for that merge.

My thought is to merge all the trunk changes into the branch (being
careful of course to record the range in the merge commit message), confirm
that everything is still working, and then finish the automation of
the template expansion.  Then finally merge it all back in to trunk.

Achilleas, I can finish the template expansion automation after we
merge trunk to branch.

How's this sound?  

The branch was created from revision 3155.  See below

    address@hidden ~]$ cd gr/anastas
    address@hidden anastas]$ svn log --verbose --stop-on-copy
    ------------------------------------------------------------------------
    r3156 | eb | 2006-08-04 12:07:21 -0700 (Fri, 04 Aug 2006) | 2 lines
    Changed paths:
       A /gnuradio/branches/developers/anastas/wip (from /gnuradio/trunk:3155)

    Created branch to use to merge in gr-trellis

    ------------------------------------------------------------------------


The current revision of the trunk is 3174

    address@hidden ~]$ cd gr/trunk/
    address@hidden trunk]$ svn up
    U  gr-usrp/src/Makefile.am
    U  Makefile.common
    U  config/grc_gr_audio_osx.m4
    U  config/grc_gr_comedi.m4
    U  config/grc_gr_audio_alsa.m4
    U  config/grc_usrp.m4
    U  config/grc_gr_video_sdl.m4
    U  config/grc_gr_audio_oss.m4
    U  config/grc_gr_audio_portaudio.m4
    U  config/grc_gr_audio_jack.m4
    U  config/grc_gr_usrp.m4
    U  config/grc_gr_audio_windows.m4
    Updated to revision 3174.

So sitting in the top of the wip directory

  $ cd gr/anastas  [your's may be named something different}
  $ svn merge -r 3156:3174 http://gnuradio.utah.edu/svn/gnuradio/trunk

should merge those changes in [Johnathan, do I have this right?]

Check that this all compiles, then commit the merge to the branch.

  $ svn commit -m 'ported r3156:3174 (lots of stuff) from trunk'

Let me know when this is complete, and I'll finish off the automation.

FYI, the example on page 51 of "Version Control with Subversion (1.2)"
"Copying Specific Changes" is what I'm looking at as I write this...

Eric