[snip]
> > No, it's a normal checkout, and I was and am merging at the same
> > folder level (_dev) from where I branched.
> >
> > I noticed however that the mentioned files have been changed in
> > another branche and then were merged to trunk (within the given
> > range 13561-15003). Is this in some way helpful/important?
>
> Well... there you go. If there has been activity in the trunk
> since the branch was done, then you must merge trunk into
> branch before you can re-integrate back into trunk. Although,
> it seems strange that it would mention revision range that
> was prior to your branch being created.
I have merged the trunk into the branch every day. And this morning when I first tried to re-integrate the trunk was on ITS latest revision, but there have been other commits on other branches in the same repositories.
Now I tried it again and it worked! The trunk was on the latest reivision and it was the latest revision in the whole repository.
Thank you very much and best regards / Freundliche Grüsse
Wenzel Metromec AG
Andreas Tscharner
--
Andreas Tscharner, Development
Wenzel Metromec AG, Rheinfelsstrasse 1, CH-7007 Chur, Switzerland
phone: +41 (0)81 257 07 00
fax: +41 (0)81 257 07 01
e-mail: mailto:andreas.tscharner_at_metromec.ch
www: http://www.metromec.ch
Received on 2010-12-07 16:12:18 CET