[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Problem mergin moves from different repos

From: Guille -bisho- <bisho_at_eurielec.etsit.upm.es>
Date: 2004-10-18 18:04:32 CEST

> > Our situation is the following: We have several environments,
> > development, testing and release and we want to commit from time to time
> > to testing several changes from development to testing when some
> > changesets correct a bug or implement a feature. After testing they are
> > eventually moved to release, but the order or the additions to the
> > development environment is not the same order of deploying on
> > testing/release, so we have to play a lot with merges, and we don't
> > wan't to copy the last version of files from devel in the case of a
> > move, just execute that "move" on testing/release.
> >
> > Is a very different and strange use-case compared to the normal way of
> > development in Open Source products. :(
> >
> > Anyway, we will see how we could overcome our problem treating moves by
> > hand.
>
> The best pratical advice I've come up with for keeping commits
> "merge flexibile" is to try to make each commit do one simple thing,
> ideally only touching a few files. This may mean checking your
> outstanding changes in as multiple independent commits (this is a
> good idea for other reasons too).
>
> E.g., if you have a commit that touches a lot of files, then the
> chances increase that this commit cannot be merged into another
> tree due to one of those files having been added in a previous,
> not-yet-merged revision.

Thanks for the advice!

> Also, svnmerge may help... http://www.dellroad.org/svnmerge/index

I didn't know that tool!!! It looks really helpfull!

Thanks!

-- 
.,,,. _  .,,,,  Guillermo Pérez    -=] 18/10/2004 [=-
  '' (v)/ ,''    - bisho@ ( onirica.com | eurielec.etsit.upm.es )
    ` ( \'
bisho! ``\\   ::        Software Patents will kill Open Source        ::
   ..........::           EuropeSwPatentFree Demostration:            ::
   ::                     http://online-demo.org                      ::
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 18 18:05:33 2004

This is an archived mail posted to the Subversion Dev mailing list.