On Fri, May 21, 2010 at 2:01 PM, Thomas Tsou <tt...@vt.edu> wrote:
> http://github.com/ttsou/gnuradio-ttsou/tree/releases/3.2
The best I've been able to find in there is 24d0fd9:
http://github.com/ttsou/gnuradio-ttsou/commit/24d0fd908510846254f7317d353506c41daf079c

This seems to have only SVN keywords-related diffs in common files,
but there are a slew of files that are in one and not the other (the
commit's tree vs 3.2.2 tarball).

I think my best bet at the moment is to import a 3.2.2 tarball into my
git repo and rebase on top of that? The reason we're stuck with 3.2.2
is that there's already an SRPM out there where we can add our changes
as a distro-level patch.

> The problem with this approach - or any method dependent on old,
> divergent branches - is that there will almost surely be conflicts if
> you plan on merging upstream.
I can't wait for the 3.3 release! :)

_______________________________________________
Discuss-gnuradio mailing list
Discuss-gnuradio@gnu.org
http://lists.gnu.org/mailman/listinfo/discuss-gnuradio

Reply via email to