Re: svn copy, branch & mergeinfo

On 05/07/09 12:33, Greg Troxel wrote:
> Andrea<mariofutire_at_googlemail.com> writes:

> There isn't mergeinfo because it's part of the natural history. 'svn
> log' will show the changesets from 1-1234 that were on the trunk, and
> --stop-on-copy will show you where the copy happened.

I see your point.

>
>> So my question is:
>>
>> 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.

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

"--stop-on-copy" works when looking at the history of a branch, but it does not help at all when I
am asked to select a revision from trunk to the branch.

Maybe some warning message saying (e.g. rev xxxx is already part of the target history) could be as
helpful.

> understand at the risk of causing problems due to things you also don't
> understand? Sorry to sound harsh, but merge tracking is very tricky
> busines; my experience is that it's necessary to be both precise and
> careful to avoid trouble.

> A useful fix would be to make the tool UI more obvious about where a
> branch came from. Trac's revision browser does this -- when you look at
> the history you see at the end "copied from ...".

I will try to write to Tortoise as well.

Andrea

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

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