keeping branch up to date with mainline

[Bernd Schmidt]

Giovanni Bajo wrote:
> Bernd Schmidt <bernds_cb1@t-online.de> wrote:
> 
> 
>>One additional question, suppose I don't want to merge a huge number of
>>revisions in one go, and I do
>>   svnmerge.py merge -r a-small-list-of-revisions
>>   svn diff ;; to verify everything is OK
>>
>>Do I then have to commit the merge so far before running svnmerge.py
>>again, or can it get all the information it needs from the local
> 
> repository?
> 
> Also note that, theoretically, it's better to do it in one-go as you'd end
> up with less conflicts.

Why is that - do you mean merge conflicts?

I imagine that most of the revisions from trunk will just apply cleanly 
since the files are unchanged on the branch.  For changes in reload*.*, 
I'd rather merge one revision at a time and make sure I update the 
affected files properly (I very much doubt any large change will apply 
cleanly in those files; they'll need manual intervention).  I assume 
it'll be easier to correct merge errors for every individual change 
rather than trying to piece them together after a monster merge.


Bernd