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

AW: Can the mergeinfo of a reintegrate-merge be ignored?

From: Markus Schaber <m.schaber_at_3s-software.com>
Date: Thu, 2 Aug 2012 10:58:41 +0000

Hi,

Von: Thorsten Schöning [mailto:tschoening_at_am-soft.de]
> Guten Tag Martin Bischoff,
> am Donnerstag, 2. August 2012 um 11:12 schrieben Sie:
>
> > Since it is recommended to delete feature-branches after they were
> > reintegrated, why should this mergeinfo be kept?
>
> Because there are scenarios where feature branches aren't deleted or even
> branched under the same name again for whatever reason. If you don't ever
> do that, ignore the merge info, but why bother unless performance is
> reduced or something?

And don't forget that branches are not really "deleted", they are still preserved in history, and can potentially be used for future merge and reverse-merge commands, or to create a new branch from them.

Also, the ongoing work on "symmetric merge" will enable you to keep your feature branches around, reusing them...

Best regards

Markus Schaber

-- 
___________________________
We software Automation.
3S-Smart Software Solutions GmbH
Markus Schaber | Developer
Memminger Str. 151 | 87439 Kempten | Germany | Tel. +49-831-54031-0 | Fax +49-831-54031-50
Email: m.schaber@3s-software.com | Web: http://www.3s-software.com 
CoDeSys internet forum: http://forum.3s-software.com
Download CoDeSys sample projects: http://www.3s-software.com/index.shtml?sample_projects
Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade register: Kempten HRB 6186 | Tax ID No.: DE 167014915 
Received on 2012-08-02 15:38:02 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.