> On Wed, Apr 24, 2013 at 9:32 AM, Bob Archer <Bob.Archer_at_amsi.com> wrote:
> > Hi Johan, Bob and all
> >
> > We took your suggestion and it still fails in that
> > 1- when we try to merge again at the root level
> > (goals:
> > a- to move subtree merge done previously to the working copy root
> > level so that the past merge can be traced at the root level using
> > "svn mergeinfo -show- revs merged)
> >
> > svn merge -c 498 https://test.com/svn/root%a0/path/to/root
> >
> > But when we do a svn status, all other untouched files and folders
> > (unrelated to the revision number) are also touched.
> >
> > svn status -u
> > M 506 src/ap
> > M 506 src/ap/k.java
> > :
> > :
> >
> > We then commit.
> >
> > We performed the above steps for several other revision numbers and
> > still get the same svn status -u output for those files and folders
> > when executing those other subsequent revision numbers.
> >
> >
> > What are we doing wrong ?
> What are the changes to those files? I assume mergeinfo is being elided from
> all those files? If so, that is something that you want to happen. Once that is
> done the first time, all your merge info will be in the root folder and you won't
> see this any more.
> Thanks for your response.
> What does elided mean ?
Elide simple means remove.
> We do see the revision numbers are moved from eligible to merged in svn
> mergeinfo after a "svn merge" and "svn commit"
>
Great... if you always do your merges from your project root, you won't see this issue again.
> How do we stop top posting and adhere to the rules ? We're new.
>
Just put your replys at the BOTTOM of your message, or inline as relevant, rather than at the top of your message.
BOb
Received on 2013-04-24 18:51:13 CEST