subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Andy Levy <andy.l...@gmail.com>
Subject Re: Big problem with svn:mergeinfo, feature branches and merging (reintegrate)
Date Thu, 01 Jul 2010 18:41:43 GMT
On Thu, Jul 1, 2010 at 14:11, sNop <snop3@seznam.cz> wrote:
> Hi,
>
> I have big problems with reintegrating feature branches. I have this problem
> only with one reposity location.
>
> I show it on example:
> 1) I create branch ( feature branch )
> 2) I switch to this branch
> 3) I change/edit only one file in this feature branch! and commit ( the
> filename which i change is assets\CrystalShop\Crystal\Shop\Abstract.php )
> 3) I switch back to trunk and try reintegrate this feature branch back to
> trunk
> 4) the result looks like this ( I show it with the help of the TortoiseSVN
> ):
> I decided, that I create video where is everything showed, so here is the
> link to the captured screen, it's online on Vimeo server ( you can watch it
> in web browser ):
> http://vimeo.com/12973409

A lot of people on this mailing list can't (or don't want to) view
video. Video is also not searchable. Please describe in words,
copy/paste any messages you get, etc.

> Thanks for any advices and suggestions, because the issue priority it's very
> critical and blocker for our company.

If support (and timely response) is a critical issue for you, you
should be paying for dedicated support.

Mime
View raw message