diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2010-12-01 20:56:11 -0800 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2010-12-01 20:56:11 -0800 |
| commit | bccd9f1e5b764cc7af7f09db93c6c4443f21ceaa (patch) | |
| tree | cddabdf803e63031cff6ddc6428cbd7ca9b95dc2 /sim/src/branch | |
| parent | 6a22b483dbe77db42861f3b076708428e5e91ad3 (diff) | |
| download | nanoengineer-theirix-bccd9f1e5b764cc7af7f09db93c6c4443f21ceaa.tar.gz nanoengineer-theirix-bccd9f1e5b764cc7af7f09db93c6c4443f21ceaa.zip | |
Moving files in preparation for merge.
Diffstat (limited to 'sim/src/branch')
| -rwxr-xr-x | sim/src/branch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/sim/src/branch b/sim/src/branch new file mode 100755 index 000000000..ee36fa20c --- /dev/null +++ b/sim/src/branch @@ -0,0 +1,33 @@ + Copyright 2005-2006 Nanorex, Inc. See LICENSE file for details. + +CVS branching is sometimes usefully done with small subsets of a +source tree. In that case, you would change the branch file to be +a list of the files specific to your branch, like this: + +----- 8< ----- +simulator.h +printers.h +part.c +minimize.c +readmmp.c +writemovie.c +debug.h +----- 8< ----- + +When you want to check out your branch, you first check out the +entire tree, then check out your branch on top of it: + +cvs co sim +cd sim/src +cvs up -r wware_mybranch_20051228 branch +cvs up -r wware_mybranch_20051228 `cat branch` + +When you've done some work in your branch and you want to commit +it, use this command: + +cvs commit -r wware_mybranch_20051228 `cat branch` + +and if the contents of the branch files changes (you need +to branch more files, or fewer, or different ones), then: + +cvs commit -r wware_mybranch_20051228 branch |