Steve Huston escribió:
Hi Manuel,
It's probably easiest if you track svn on master via svn rebase
and
then git rebase your branches against that, that way the person
who
made the origional change (on the branch) can fix any conflicts
that
occur as they happen.
I agree with that. It's easier to have an unique reference of the
svn
evolution in the master branch.
Right... So that's what we'll do.
Is git rebase needed in the master branch, anyway? Don't we
just need to
keep upgrading that branch with the stuff coming from the svn repo?
I
think that rebase is intended when you want to merge local
changes and the evolution of an external resource, true?
I _think_ so, yes.
So, in my mind:
-Somebody updating the master branch with svn stuff. Steve, could
you
perform that task. I'm afraid I would need some other tool,
and suffer another dependency hell in solaris.
Yes, I'll set up a cron job to run at least once a day pulling things
from svn and running a build.
Nice.
-People working in the windows/solaris/whatever branches rebasing
against the trunk to keep updated, and be able to generate
patches that could be applied against svn head.
Sounds good!
Great effort. Steve. Thanks a lot.
Regards.
- Manuel.
Thanks,
-Steve
