[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: Problems with uncommitted working directories, from home and work.

From: Jim.Hyslop
Subject: RE: Problems with uncommitted working directories, from home and work.
Date: Tue, 2 Dec 2003 11:04:24 -0500

Craig O'Shannessy [mailto:address@hidden wrote:
> I work onsite about half the time and offsite the other half.  Some
> nights, I'll be onsite, be half way through a complex set of changes,
> have heaps of modified files, and have to go home.
> The next morning, I want to pick up from where I left off, 
> but this time
> from home.  I can't commit the stuff at work (at least to the head
> branch), because it's not stable enough (may not even build).
This is where "private branches" come in. Private branches are never
considered candidates for releases or for builds. The contents of private
branches are potentially meaningless, except to the person who created them.

We use a naming convention for private branches: the name starts with
"priv-" and contains something identifying the developer. Since you are
using the branch to effectively transfer files between home and work, you
might use:

cvs tag -b priv-craig-transfer

When you are ready to go home, check everything into the private branch.
When you resume work from home, then there are a couple of ways you can

1) You can work from the trunk, by immediately merging your private branch
into your trunk code. This will allow you to immediately update any changes
anybody else checks in. The drawback is, if you aren't ready to check in by
the end of the day, you have to create another branch or move the existing
branch (this can get cumbersome, because IIRC you must remove all revisions
from a branch before you can remove the symbolic branch tag - might just be
easier to use branch tags keyed by date, e.g. priv-craig-transfer-20031202).

2) You can work from the branch, and merge any changes anyone checks in
during the day into your code, and when you're done merge it back to the
trunk. In other words, treat it like any normal branch.

My inclination would be to use the first approach. But do whatever works
best for you.

Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. (
Columnist, C/C++ Users Journal (

reply via email to

[Prev in Thread] Current Thread [Next in Thread]