RE: svn copy, branch & mergeinfo

> >> should "svn copy" add to the destination a merge info property (in
> >> this case /trunk:1-1234)?
> >
> > No, no more than trunk should have self-referential mergeinfo.
> >
> >> I've tried to manually change the property and it did the job.
> >
> > Did what job? Let you see something you expected because you didn't
>
> What happens is that, using tortoise, when I merge from trunk to branch
> and I am asked to select
> which revisions to pick I see the log of trunk and there, I have no
> idea what is already part of the
> history of the branch (because it was before the branch point) or
> after.

In Tortiose if you want to merge everything that hasn't been merged yet you don't need to select revisions to merge. That said, if you are using 1.6.x of Tortiose the already merged in items should be grey'ed out... although some people report that it is too subtle to see.

You don't have to select the rev's though... unless you are cherrypicking.

> While with my change, all revisions 1-1234 are greyed out and cannot be
> selected.

Where those revisions merged in before you started using svn 1.5? If so then there will be no merge properties which indicate 1-1234 are already merged in. If that is the case, then yes adding the merge info is the correct thing to do. You would have to look in the TSVN doc to see how to do a "record only" merge.

BOb

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2368417

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-06 17:41:06 CEST