[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Checking for merge updates with "svn status -u -g"

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 9 May 2012 09:43:00 -0400

On Wed, May 9, 2012 at 9:40 AM, Stefan Sperling <stsp_at_elego.de> wrote:
> On Wed, May 09, 2012 at 09:32:05AM -0400, James Hanley wrote:
>> When creating a branch, it would be very useful if merge data could
>> optionally be included in svn status -u with the -g option.
>> Essentially, it would tell you if there are changes upstream from the
>> origination of the branch... I'm not entirely certain what the output
>> should look like, but it might indicate a table key of ancestry at the
>> top and a similar output to "svn status -u" with indication of where
>> the ancestry has the update yet to be merged:
>>
>> [a1 = /trunk]
>> [a2 = /branches/team_branch_base]
>> [a3 = /branches/userbob_feature_widget]
>>             *     517   ./hello.c
>> [a1]        *     507   ./world.c
>>             *     517   ./foo.h
>>             *            ./bar.h
>> [WC] M            569   ./dir
>> [WC] M            569   ./dir/file.c
>>
>> Thoughts?
>
> This command lists files that differ between branches, which may
> be a close match to what you're asking for:
>
>  svn diff --summarize BRANCH1_URL BRANCH2_URL
>
> You'd have to run it separately for each branch you're interested in.

I would probably go with:

$ svn mergeinfo --show-revs=eligible ^/source-branch

Some GUI tools, at least Subclipse, will show this info in log-style format.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
Received on 2012-05-09 15:43:33 CEST

This is an archived mail posted to the Subversion Users mailing list.