Is there any way of easily deciphering (i.e. at a glance) whether or not a branch has already previously been merged with the another branch or the trunk? The nearest I've been able to figure out is by looking at the commit notes and displaying the merged commit notes. The disadvantage with this seems to be that unless you know which branch the commit notes are imported from, there's no way to decipher which branches have already been merged or not.

Edit: Is Mercurial or Git any more intuitive than SVN for this?

解决方案

Type:

svn help mergeinfo

And you get:

mergeinfo: Display merge-related information.

usage: mergeinfo SOURCE[@REV] [TARGET[@REV]]

Display information related to merges (or potential merges) between

SOURCE and TARGET (default: '.'). If the --show-revs option

is not provided, display revisions which have been merged from

SOURCE to TARGET; otherwise, display the type of information

specified by the --show-revs option.

Valid options:

-r [--revision] ARG : ARG (some commands also take ARG1:ARG2 range)

A revision argument can be one of:

NUMBER revision number

'{' DATE '}' revision at start of the date

'HEAD' latest in repository

'BASE' base rev of item's working copy

'COMMITTED' last commit at or before BASE

'PREV' revision just before COMMITTED

--show-revs ARG : specify which collection of revisions to display

('merged', 'eligible')

Logo

开放原子开发者工作坊旨在鼓励更多人参与开源活动,与志同道合的开发者们相互交流开发经验、分享开发心得、获取前沿技术趋势。工作坊有多种形式的开发者活动,如meetup、训练营等,主打技术交流,干货满满,真诚地邀请各位开发者共同参与!

更多推荐