Discussions  >  CollabNet Subversion Client  >  RE: merge problem

Hide all messages in topic

All messages in topic

RE: merge problem RE: merge problem

Author pburba
Full name Paul Burba
Date 2011-05-26 08:23:44 PDT
Message > One quick thing to add: in dir-props for the branch working copy, it reads"
>
> K 13
> svn:mergeinfo
> V 14
> /trunk:229-315
> END

To follow-up from my first response, this is probably because your merge, while it didn't have any diff to apply, did record mergeinfo to describe the merge.

Also keep in mind that information you are looking at in dir-props and entries is readily available using 'svn st -v' and 'svn propget svn:mergeinfo'.

> But /.svn/entries says "dir
> 302"
>
> So svn:mergeinfo seems to be wrong, but I'm hesitant to edit it by hand.

In general don't edit mergeinfo by hand* unless you are absolutely sure there is a bug and absolutely sure there is no other fix possible.

* "By hand" in this case meaning via the 'svn propset' command. I'm sure you didn't mean hand editing any files in the .svn directory ;-)

Paul

RE: merge problem RE: merge problem

Author pburba
Full name Paul Burba
Date 2011-05-26 08:13:11 PDT
Message > I'm trying to merge a branch from trunk (I've run this
> exact merge several times before with no problem). svn
> mergeinfo tells me that there are no eligible
> revisions,

Hi Peter,

The 'svn mergeinfo --show-revs eligible ^/SOURCE TARGET' only shows revisions that would actually impact TARGET if a merge was attempted. So if r303-r314 don't affect your trunk, they are ignored by 'svn mergeinfo'.

> and that the branch has already been merged
> from trunk up to r314.

How exactly does 'svn mergeinfo --show-revs eligible' tell you that? I might be misunderstanding what you mean here...

> But trunk is at r314, while the
> branch remains at r302. Actually running the merge
> does nothing at all.

Again, it might not have anything to merge because r303-r314 doesn't affect ^/trunk. It should be updating the mergeinfo on the branch however. Run it again and then run 'svn st' and 'svn diff'. Do you see any changes to the mergeinfo on the target? Something like this?

Property changes on: branch-wc
____________________​____________________​____________________​_______
Modified: svn:mergeinfo
   Merged /trunk:r303-314

Basically this means, "Nothing was merged, but now this branch is synced with trunk up to r314".

The update of the svn:mergeinfo property happens silently (in the forthcoming 1.7 release there are special notifications to avoid potential confusion).

Paul

> I can't figure out what's going
> here. How can I troubleshoot and resolve this?
> Thanks.

RE: merge problem RE: merge problem

Author silphium
Full name Peter Weil
Date 2011-05-25 08:47:14 PDT
Message One quick thing to add: in dir-props for the branch working copy, it reads"

K 13
svn:mergeinfo
V 14
/trunk:229-315
END

But /.svn/entries says "dir
302"

So svn:mergeinfo seems to be wrong, but I'm hesitant to edit it by hand.

merge problem merge problem

Author silphium
Full name Peter Weil
Date 2011-05-25 08:07:53 PDT
Message I'm trying to merge a branch from trunk (I've run this exact merge several times before with no problem). svn mergeinfo tells me that there are no eligible revisions, and that the branch has already been merged from trunk up to r314. But trunk is at r314, while the branch remains at r302. Actually running the merge does nothing at all. I can't figure out what's going here. How can I troubleshoot and resolve this? Thanks.
Messages per page: