[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Help with merging from dev branch to one or more child branchesthen
From: |
Sergey Gurov |
Subject: |
RE: Help with merging from dev branch to one or more child branchesthen Trunk |
Date: |
Sat, 27 Sep 2003 14:11:32 +0400 |
1. Tag all files in Dev branch BEFORE change (e.g. pre_bug_123)
2. Commit your changes into DEV.
3. Tag Dev branch again (e.g. fix_bug_123)
4. Go to trunk. Run 'cvs update -j pre_bug_123 -j fix_bug_123 YourFiles'
5. Enjoy.
Sergey
> What are the best practice to apply this change over 10 files
> to Branch A
> and Main Trunk? How can I achieve this? The change should be
> numbered and
> that 10 checkins should be commented related to one bug? How
> can I apply
> that change from Branch DEV to Branch A, B and more, then to
> the Trunk?
>
> Thanks
>
> Baz