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

Merge, branch, reintegrate, problem

From: Gonzalo Bourdieu <gonzalobourdieu_at_gmail.com>
Date: Wed, 3 Jun 2009 11:33:08 -0300

Hi,

first of all thanks for your (possible) replies, im really new to this
mailing list, but im getting a little desperate.
I got an svn repository that has change (2 months ago) the branching
strategy, and i think that now there are little things that i've screwed up.

At first stage, i was using the branch-first, then integrate to trunk
strategy.
So, i create branches/0.2 and when i finish working on that, i merge
everything to the trunk, and after that, i branch it to the 0.3 (from the
trunk).
After realizing that this was not the best strategy for my workflow, i (at
version 0.7) change to another strategy. Work in the trunk, and when a
version was ready, at that moment i branch to (for example) 0.8 and leave
the trunk to continue working on the new version (0.9).
The bug fixes where made over the branch, and then they were merge with the
trunk.

My situation now is that i have:
/branches/0.9 with the latest stable code
/trunk/ with the latest code (with all the changes made it in 0.9 merged)

For all this merging i always use the simple merge. But now, i'd create a
new feature branch from the trunk. So at this time, i'll have:
/branches/0.9
/branches/ft_amazon_s3
/trunk

An i passing day by day all the changes made in the trunk to this feature
branch, to stay them synced as the book suggests. The problem is that, when
i want to reintegrate the feature branch into the trunk, im getting errors
as if some files were never merged into the feature branch. And that
obvioulsy cannot happen because i just merge the last version of the trunk
with the feature branch.
The error looks like this.

Error: Reintegrate can only be used if revisions 547 through 575 were
previously
Error: merged from
https://bassobrovelli.springloops.com/source/bartrends/trunk to the
Error: reintegrate source, but this is not the case:
Error: branches/ft_amazon_s3/tests/fixtures/drink_ingredient_fixture.php
Error: Missing ranges:
/trunk/tests/fixtures/drink_ingredient_fixture.php:547-572
Error: branches/ft_amazon_s3/views/drinks/edit.ctp
Error: Missing ranges: /trunk/views/drinks/edit.ctp:547-572
Error: branches/ft_amazon_s3/views/elements/logs_panel/entry_day.ctp
Error: Missing ranges:
/trunk/views/elements/logs_panel/entry_day.ctp:547-572
Error: branches/ft_amazon_s3/views/layouts/default_1_column.ctp
Error: Missing ranges:
/trunk/views/layouts/default_1_column.ctp:547-572

But this is not the only problem, when im merging changes from trunk to
feature branch, im always getting the same files updated, because all this
files have the svn mergeinfo property, and they get the new commit revision
number updated, so this could be an infinite thing, because everytime that i
commit the changes in the feature branch merged from the trunk, the major
revision number will increase and this files with mergeinfo property will be
marked as diff in the next "merge".

So, there is a possible way to solve this, or i have to be attached to the
normal merging (i dont know how the merge from the feature branch to the
trunk could result), or maybe the best thing is to create a new empty
repository and start everything again (all the history that im loosing if
this is the solution make me really sad).

Thanks in advance,
gonzalo

pd: sorry for my english.. and myy sooooooooooooo long mail.

-- 
Gonzalo Bourdieu
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2359090
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-03 16:40:14 CEST

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