[Top][All Lists]

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

Re: Is there a safe way to do this kind of offline CVS management?

From: Spiro Trikaliotis
Subject: Re: Is there a safe way to do this kind of offline CVS management?
Date: Sun, 3 Apr 2005 11:31:01 +0200
User-agent: Mutt/1.5.6+20040907i

Hello Doug,

* On Sun, Apr 03, 2005 at 04:13:24AM -0400 Doug Lee wrote:
> I very much prefer having the off-site history preserved in the main
> repo, for various reasons.  I'll have to think through how important
> that really is though.

Another option I use many times:

Before going away from my CVS server, I checkout a sandbox (on an own
branch) on which I want to work, in a directory dir/. After this, I
copy dir1/ to another directory, for example, dir.1/.

Now, whenever you want to check in something, copy dir/ to dir.2/,
dir.3/, dir.4/, and so on. Furthermore, write the changelog you would
want to apply into a file with a "speaking" name, for example,
changelog.dir.2, changelog.dir.3, and-so-on.

When you come back home, do the following:

- go to dir.2, commit and use the changelog file changelog.dir.2
- go to dir.3, use cvs up, commit and use the changelog file
- go to dir.X, use cvs up, commit and use the changelog file

This way, you preserve all the history (in a branch, but at least, you
have it).

This way, there is no need to fiddle with the CVS repository itself.

Another option, which involves some manual steps but allows you to even
ommit the branch: Do as before, that is, generate dir.1, dir.2, dir.3,
and so on.

After coming home, diff against the directories (diff -urN dir.1 dir.2 >
1-2.diff, diff -urN dir.2 dir.3 > 2-3.diff) and put the diffs into
files. Now, go to dir.1 (the original copy), cvs up, and apply the diffs
to the sandbox (patch < 1-2.diff), commit and use changelog.dir.2. Now,
apply the next diff, commit and use changelog.dir.3. As long as there
are no conflicts applying the patches, this works as expected

I hope I did not forget any step.


Spiro R. Trikaliotis                               

reply via email to

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