Re[2]: How does 'merge' work?

BCS> Philip Martin <philip@codematters.co.uk> writes:

>> This merge gets a patch that represents the changes made to dir and
>> then uses a three-way diff to apply the patch to dir_branch. Whether
>> you get conflicts depends on what you have done to dir_branch since
>> you copied it.

BCS> Right. The immediate thoughts that came to my head were:

BCS> 1. merge applies patches to your tree.
BCS> 2. you can't *ever* get a conflict, unless you have local mods.

BCS> :-)

Thank you for response. I understand how it works indeed, but how can
my problem be solved?

I have, for instance, integration branch and developer's branch. As a
developer I am interested to merge periodically fresh changes from
integration branch to developer's one. Surely, it may be conflicted
operation, I don't want to lose neither my changes nor changes from
integration branch.

As I thought before, Subversion remembers the history of merging branches
and I don't need to specify something like
    -r<last-time-i-did-merge>:<latest-revision>

The way I described in the original letter seemed very natural to me, now
I understood that it is wrong method. Is there any alternative method to
perform such kind of merging?

Thanks,
Dmitry

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 21 19:58:23 2002