Discussions  >  CollabNet Subversion Client  >  RE: merge problem

Back to topic list

RE: merge problem

Author pburba (OCN Member)
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.

« Previous message in topic | 4 of 4 | Next message in topic »

Messages

Show all messages in topic

merge problem silphium (OCN Member) Peter Weil 2011-05-25 08:07:53 PDT
     RE: merge problem silphium (OCN Member) Peter Weil 2011-05-25 08:47:14 PDT
         RE: merge problem pburba (OCN Member) Paul Burba 2011-05-26 08:23:44 PDT
     RE: merge problem pburba (OCN Member) Paul Burba 2011-05-26 08:13:11 PDT
Messages per page: