[Geany-devel] Build-system merge

[Nick Treleaven]

On Tue, 25 Aug 2009 21:45:12 +1000
Lex Trotman <elextr at gmail.com> wrote:

> > The src/ conflicts were quite a lot, and each one should have just
> > taken the branch version instead of conflicting AFAICT.
> 
> Heh heh, thats what I thought when merging trunk to branch the first
> time and I wiped out Enrico's toolbar changes, oops!!

Mmm, but having merged trunk to the branch first it should have worked
In Theory (TM). I guess it may have been because your merge 'knew' more
about where the code had come from, who knows.

> >> ChangeLog probably needs to be checked that it has everything.  It
> >> currently is in the order of merges between branch and trunk, I'm not
> >> sure if it should be re-sorted to date order, easier to find changes
> >> but loses the merge history.?
> >
> > No, the trunk ChangeLog is for trunk only. There should be one entry
> > describing all the changes in the merge, dropping any trivial
> > commit messages.
> 
> Thats a pity I didn't know that before, I could have dropped the

Sorry, forgot to mention it.

> branch stuff while it was easy to find.  I'm afraid I'm not sure how
> to separate it now?

What about:
svn merge -c -4120 ChangeLog

Regards,
Nick