On Fri, 2008-04-11 at 11:32 +0200, Paul Sandoz wrote:
> Martin Grotzke wrote:
> > Hi Paul,
> >
> > On Fri, 2008-04-11 at 10:34 +0200, Paul Sandoz wrote:
> >> On Apr 11, 2008, at 10:26 AM, Martin Grotzke wrote:
> >>> Do you think there might be conflicts between your changes and the
> >>> things we're doing in the branch?
> >> There should not be. If you can i recommend regularly syncing the
> >> branch with changes from the trunk.
> > Hmm, I could merge in changes from the trunk, but AFAIK this would
> > create conflicts when merging the branch back to the trunk (from
> > revision of stop-on-copy to the latest one).
> >
>
> It should not if you pick the right revision numbers to start from for
> each merge. With SVN this can be frustrating.
I was thinking of a merge based on a diff of two source urls at specific
revisions - probably this is the first option shown by svn help merge.
I'll check if this does what I think it should do...
Cheers,
Martin
>
>
> > If you can show me on how to do the sync without such issues later on I
> > would be very happy :)
> >
>
> When i get time i will do a merge and tell you what i did.
>
> Paul.
>
--
Martin Grotzke
Dipl.-Inf.
freiheit.com technologies gmbh
Straßenbahnring 22 / 20251 Hamburg, Germany
fon +49 (0)40 / 890584-0
fax +49 (0)40 / 890584-20
HRB Hamburg 70814
eb0e 645c 9730 c8a3 ee2f 1b9a 5de5 21cb c259 fe34
Geschäftsführer: Claudia Dietze, Stefan Richter, Jörg Kirchhof