suggestions on a good workflow?

[stephen]

hi, we just have this new project that is a fork from an opensource
project.. the opensource project has an svn repo and has a git repo
which is a mirror of the svn one.. what we did was get the trunk HEAD
from the svn repo and imported it in our own internal svn repo.. since
the opensource project is quite active, we want to have a workflow for
merging their changes to our repo, is their a better workflow for this
than:

svn checkout http://svn.opensourceproject.com/trunk
svn diff -rlast_update:HEAD > for_merge.diff
#get the patch and apply to our svn repo

this workflow is really troublesome since it will require to resolve
the conflicts over and over again each time we do a merge.. i know
this would have been painless if we just go ahead and use the git repo
but my colleagues aren't familiar with git.. (svk doesn't seem to have
the power to merge two working copies with different mirrors?)
suggestions are always appreciated..:)

[Mark John Buenconsejo]

I think git is the best workflow so far. I have tried a similar
situation before, and having git to track different remote
repositories, like the original open source repo and our git repo is
pretty straight-forward. Fetch and merge from original and push
changes to our own repo.

I think SVN won't be able to do this at all, without doing a manual
merge using a different tool outside from SVN.

Thanks!

Mark

--
------------------------------------
Mark John S. Buenconsejo
http://www.simpleteq.com

[Greg Moreno]

Hi Stephen,

We were in a similar situation several months ago and like you, no one
in our team has any experience in git. But we knew SVN is not suited
to the problem we had at that time.

Our options were:
A. Use an existing tool that WILL NOT solve the problem.
B. Learn a new tool that will solve the problem.

Yes, there will be downtime during the transition but just consider
the benefits to your team using git against the cost of learning it.
I'm sure option B would make sense.

I find these two sites very useful when learning git:

http://eagain.net/articles/git-for-computer-scientists/
http://www.kernel.org/pub/software/scm/git/docs/user-manual.html

Regards,

Greg

On Wed, Jul 30, 2008 at 2:59 PM, stephen <devp...@gmail.com> wrote:
>

[stephen]

hi mark and greg,

thanks. you guys are probably right, i've tried a combination of
using both git and svn so that a maintainer/merger could painlessly
merge them but am on a dead end, would have been really easy if we're
using just git. well i'm suggesting it to them..;)

stephen

a sidenote: liked the 2nd link greg..;) -- i use it also to tell
someone rtfm. hehe.

On Jul 30, 8:37 pm, "Greg Moreno" <greg.mor...@gmail.com> wrote:
> Hi Stephen,
>
> We were in a similar situation several months ago and like you, no one
> in our team has any experience in git. But we knew SVN is not suited
> to the problem we had at that time.
>
> Our options were:
> A. Use an existing tool that WILL NOT solve the problem.
> B. Learn a new tool that will solve the problem.
>
> Yes, there will be downtime during the transition but just consider
> the benefits to your team using git against the cost of learning it.
> I'm sure option B would make sense.
>
> I find these two sites very useful when learning git:
>

> http://eagain.net/articles/git-for-computer-scientists/http://www.kernel.org/pub/software/scm/git/docs/user-manual.html
>
> Regards,
>
> Greg

>
> On Wed, Jul 30, 2008 at 2:59 PM, stephen <devpo...@gmail.com> wrote:
>
> > hi, we just have this new project that is a fork from an opensource
> > project.. the opensource project has an svn repo and has a git repo
> > which is a mirror of the svn one.. what we did was get the trunk HEAD
> > from the svn repo and imported it in our own internal svn repo.. since
> > the opensource project is quite active, we want to have a workflow for
> > merging their changes to our repo, is their a better workflow for this
> > than:
>

> > svn checkouthttp://svn.opensourceproject.com/trunk

[Greg Moreno]

On Thu, Jul 31, 2008 at 10:18 AM, stephen <devp...@gmail.com> wrote:
> thanks. you guys are probably right, i've tried a combination of

You're welcome.

HTH

- Greg

[botp]

On Jul 31, 10:18 am, stephen <devpo...@gmail.com> wrote:
> i've tried a combination of
> using both git and svn so that a maintainer/merger could painlessly
> merge them but am on a dead end, would have been really easy if we're
> using just git.

just in case you want to learn something new, try mo rin si bzr;
maganda wrkflow and interoperability w svn is almost seamless (and
since it's python driven, it runs on windows too [wc is good if you
have a sizeable windows dev group])

http://bazaar-vcs.org/Workflows
http://bazaar-vcs.org/BzrForeignBranches/Subversion
http://bazaar-vcs.org/BzrVsGit

kind regards -botp

[stephen]

hi botp,

thanks, great windows support too.. if we use this, we might:
1. checkout the opensource project from svn
2. fork from svn _working copy_(creating a bzr branch)
3. push our changes on that bzr branch then on

my general wondering is if we could merge the changes in that svn repo
properly in step 2(e.g. just svn up or svn co and maybe someth like a
bzr merge command)?

--stephen