I ran into this same problem consistently, so found a way around it.
You can create the branch _JUST BEFORE_ checkin.
cvs update -A # get to the trunk
edit files ....
# opps, it's a biggie after all
cvs tag base-mybranch # Save markers
cvs tag -b mybranch # or hate yourself later
cvs update -r mybranch # Switch to the branch -- only changes CVS's records
cvs commit # and save to the branch
As far as I know, this will work even if a later commit has been made since you reset
(update -A) in the morning.
Harald Kucharek wrote:
>
> Just got the following idea:
>
> When you work with CVS you backup your repository as often as possible.
> My workspace is on a local disc I have to take care of myself.
> Usually, when I plan to make big changes that will take some time I
> start a private branch where I commit to at least in the evening so
> my work is in the repository. When I finish, I merge to the trunk.
> Now, if I just have to make a few small changes where I don't want
> to create an extra branch for. If this takes longer than expected, I can't
> simply commit, this would put some broken code into the repository,
> making my collegues happy when they update their workspaces the next morning.
>
> I thought of making a script which looks for modified files in my workspace,
> collects them and puts them aside in some way, by copying to another
> disk (on another server) or by creating a compessed archive and then
> putting this away. Would be perhaps a nice macro. I think, the
> 'Fast Search Modified' would be a good starting point. Now, I'm not used
> to Tcl and I'm even lesser used to scripting on NT, so maybe someone
> out there has already done such a thing and would share it.
>
> Harald
>
> --
> iXpoint Informationssysteme GmbH #
> Daimlerstr. 3 # Harald Kucharek
> 76275 Ettlingen # [EMAIL PROTECTED]
> Tel/Fax +49 7243 3775-0/77 # www.ixpoint.de
