On 9/21/06, Raman Gupta <[EMAIL PROTECTED]> wrote:
> On Wed, 20 Sep 2006, Rich Williams wrote: > ... >> - a way of suppressing the revisions which are just setting up branches >> (i.e. Initialized merge tracking via svnmerge).The -b switch handles this fine... or did I misunderstand you?
Well I'm not sure what we're doing wrong then, because we see quite a bit of it - doing 'avail' from our trunk to our live branch at the moment, roughly 16% of the available revisions are 'Initialized merge tracking' (we have 36 branches just now). I've attached a simple script which will reproduce it - it'll destroy and create a repository and working directory in the directory it's run from, so please don't run it from anywhere important! The script creates a trunk and two branches (both set up for bi-directional merges), makes a change in one branch, merges it back to trunk, and then does an 'avail' from the other. The available changes include the initialisation of the first branch. Hopefully the script will explain what I mean, or maybe throw light on something we might be doing wrong. Have fun, Rich
repro.sh
Description: Bourne shell script
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
