[Adium-devl] Version control

[Augie Fackler]

On Oct 8, 2007, at 12:10 PM, Richard Laager wrote:

> On Mon, 2007-10-08 at 01:22 -0700, David Smith wrote:
>> "fast path" tasks:
>>
>> Merge Branch Into Trunk
>
> mtn propagate $BRANCH $TRUNK

Can

>
> Also, the one you can't do with SVN:
>
> # Make a branch
> # Other commits happen on trunk
> mtn propagate $TRUNK $BRANCH
> # Other commits happen on trunk (and maybe on the branch as well)
> mtn propagate $TRUNK $BRANCH
> # More commits happen on trunk
> mtn propagate $TRUNK $BRANCH
> # You're finally ready to merge it back.
> mtn propagate $BRANCH $TRUNK
>

Can you cover exactly what propagate means here? I've heard the term  
thrown around but I've never really understood well because....I dunno.

Does it just merge over changes that happened on trunk? What about a  
change that happens in both places (say I commit on a branch, merge  
that one change to trunk), and then I merge trunk to the branch. Will  
that cause a problem?

Thanks,
Augie

>>
> Richard
> _______________________________________________
> Adium-devl mailing list
> Adium-devl at adiumx.com
> http://adiumx.com/mailman/listinfo/adium-devl_adiumx.com