[Svnmerge] question about using svnmerge after manually merging for a while

Chris Hall christopher.k.hall at gmail.com
Mon Mar 29 09:12:45 PDT 2010


I've just started with svnmerge after manually merging branch/trunk,
and have a question...i've inited trunk and a branch, then done an
'avail' within the trunk, and I get a huge list of revisions available
to merge.  I was wonder, is there a way to init so svnmerge only goes
so far back?  We did a manual merge of branch -> branch last week, but
there are some changes in branch i need to merge back and I would like
to use svnmerge.py to do so, but I don't want to merge in EVERYTHING,
just the recent change and go from there.  Is that possible?

trunk$: svn merge avail -b -S $MYBRANCH
2975,2992,2999,3001,3005,3008,3010-3019,3021-3022,3025-3029,3033,3035,3040-3041,3067,3081-3083,3087-3088,3090,3092-3096,3098-3107,3109-3113,3115-3131,3180,3212-3215,3217,3222,3228-3236,3238,3242-3244,3247-3251,3259,3281-3282,3291-3292,3298-3300,3308-3315,3327-3330,3332-3333,3336,3339-3353,3355-3363,3393,3430,3442-3444,3446-3447,3451-3458,3460,3463-3464,3466-3469,3471,3474-3477,3479,3481,3483-3485,3487-3507,3509-3510,3512-3514,3517,3523,3528-3529,3533-3536,3542-3544,3548,3550,3552,3555,3561-3564,3566-3568,3571-3572,3574-3575,3577-3582,3584,3587-3591,3597,3599-3619,3622-3629,3631-3638,3640-3659,3661-3669,3671-3679,3685-3688,3690,3693-3696,3700

feature-dev$: svn merge avail -b -S $MYTRUNK
2976-2986,2988-2991,2993-2994,2996-2998,3000,3002,3004,3006,3009,3030-3032,3042-3043,3045-3056,3058-3063,3065,3068-3070,3072,3074-3080,3089,3091,3108,3132,3134-3147,3149-3163,3165-3173,3175-3179,3181-3184,3186-3193,3195-3205,3207-3209,3211,3216,3218,3220-3221,3223-3225,3227,3237,3240,3245,3252,3254-3255,3257-3258,3260-3262,3264-3274,3276-3280,3283-3284,3286-3290,3294-3297,3301-3306,3316,3318-3321,3323-3325,3331,3334,3337,3354,3364,3366-3368,3370-3371,3400-3417,3420-3422,3428-3429,3431-3435,3439-3440,3445,3448,3450,3459,3461-3462,3465,3470,3472,3480,3486,3516,3518,3520-3522,3524-3526,3530,3537-3541,3545-3547,3553,3556,3559,3569,3573,3585,3592,3594-3596,3692,3698



recent revision info:

rev 3698 (merge branch to trunk)
rev 3699 (tagged trunk)
rev 3700 (code change in branch)
rev 3701 (svnmerge init in trunk)
rev 3702 (svnmerge init in branch)

Thanks.

Chris


More information about the Svnmerge mailing list