[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: branches/kdepim/enterprise4/kdepimlibs
From:       Marc Mutz <marc () klaralvdalens-datakonsult ! se>
Date:       2008-06-21 10:48:25
Message-ID: 200806211248.28614.marc () klaralvdalens-datakonsult ! se
[Download RAW message or body]

On Friday 20 June 2008 23:58, Thomas McGuire wrote:
> > Don't block them, use -b.
>
> OK, will do that in the future. What is the impact of this? svnmerge help
> merge says it might speed things up, or is there something else I need to
> be aware of?

You don't have to block revisions anymore. Blocking should be reserved for 
things you actively don't want to be merged back, like a feature that's not 
acceptable, but not for general merge management. For that, merge -M and 
avail/merge -b should be used.

Thanks,
Marc

-- 
Marc Mutz -- marc@klaralvdalens-datakonsult.se, mutz@kde.org
Klarälvdalens Datakonsult AB, Platform-independent software solutions

[prev in list] [next in list] [prev in thread] [next in thread]