Lines Matching refs:working
106 Most development starts with everyone working on the same
154 - A CVS working directory satisfies the definition of "branch"
160 collection of files in your working directory. It is *not* the
195 Remember that you can think of your working directory as a "branch for
214 whole development organization working on the files.
216 Rather than trying to share a working directory, you can move onto a
218 the branch. Developers not working on the branch won't see your work
243 "Checkout" or "update" your working directory onto the branch.
253 Suggested procedure when using your working directory, which
254 contains the revisions of your working files you want to branch from:
276 your working directory, you can use "cvs tag -b <branch_tag>" instead
280 working directory was checked out.
351 - "update -r <tag>" tells CVS to attach a "sticky tag" to working
358 - A "sticky" <branch_tag> indicates that the working directory (and
359 working files) are "on the branch".
386 and forget them. If a group wants to continue working, tell them to
421 If you don't have a working directory, you can checkout and merge in
427 If you already have a working directory:
456 The way to merge *all* changes made on the trunk into a working
462 Then merge the changes from the trunk into your working branch using
561 [[If you find working techniques, I'll add them here.]]
579 directory associated with your working directory.
592 Repository, "update -A" will make it appear in your working directory
617 9. How do I know what branch I'm (working) on?
624 The *same* tag is on *every* file in your working tree, *and*
630 then you know what branch you are working on. You can get sticky Tag
640 the "status" command) indicates what branch the working file is on.
643 To force your entire working directory onto the same branch, type:
649 10. Do I really have to know the name of the branch I'm working on?
764 branch from your single working directory.)
775 Note: You could also checkout a whole new working directory and
852 mark the revisions you have in your working directory, which
857 working directory with a non-branch tag, which means you won't
866 As in #1, you can't commit to this kind of working area,
878 If you add a branch tag to file in a working directory that was
897 not a branch. To start working right there, you have to create a
902 You can do it in place and keep working:
907 You can do it "externally" and create a new working directory:
936 working branch directly onto the trunk.
941 Move your working directory to the Main Branch.
946 it over your working files. Make sure you don't have an modified files
954 Commit all the working files onto the Main Branch.
1029 merges committed changes from the Repository into the working file.
1163 directory in the checked out working tree will match the "module" name
1198 Here's another way to construct a working directory out of pieces of
1272 If there is a lot of overlap among the developers working on the
1312 working environment. Here is a taxonomy of environments I have worked
1317 A small number of competent developers working on a medium size
1352 cooperated with the others, working on 57 different projects, most of
1451 files. Or you could rm -r pieces of the resulting working directory
1671 If the working file exists, and hasn't changed (determined from the
2181 is a viable working paradigm, or if you believe you can keep track of
2241 corresponding directory in every checked-out working directory. At the
2246 everyone to remove their working directories and check them out again
2249 - The file exists in the working directory and in the ./CVS/Entries
2265 For each file, copy the working file to a new name in the working
2273 - You lose the connection of your new working file to its past
2336 checked-out directory and remove the matching working directory by
2360 within the Repository, check out that directory and start working.
2461 for a working directory.
2538 files (./CVS/Repository and ./CVS/Root) in every working directory
2544 If all ./CVS/Repository files in all working directories contain
2547 Have everyone "release" or delete their working directories (after
2567 permissions on both your working file and on the Repository file from
2571 "update" (or after a "commit"), your working file is set to match the
2603 "How can I lock files while I'm working on them the way RCS does?"
2761 TAG1 ever existed and you clean up any working directories with sticky
2763 removing the working directories.
2805 working directory. And you will lose all your log entries when you
2856 auto-merged into CVS working directories during "update", the opposite
2878 other files in the working directory.
2889 existing working directory, whether it was because a new revision was
2890 committed by someone else or because you deleted your working file,
2891 the timestamp on the retrieved working file *must* be set to the
2895 particular timestamp on the file within your working area. But later,
2898 each other than than it is for working files to match the timestamps
2907 The "checkout" command normally sets the timestamp of a working file
2948 "cvs -n diff". If you are looking only at your working files, tagged
2972 Each CVS working directory contains a ./CVS/Entries file listing the
2973 files managed by CVS in that working directory. Normally, if the
2979 Added to the Repository from another working directory.
2992 individual file or a module that creates working directories that
3196 working alone, a umask of 077 is OK. If everyone is working only in
3229 2. How do I add a new file to the branch I'm working on?
3303 onto the branch where you are working.
3310 where you were working:
3365 option only for the copy of the file in the current working directory.
3430 ("cvs tag -F TO_BRIAN") the working directory, which is then ready to
3547 ./CVS/Entries file matches your working file. CVS believes that your
3622 "Update" is intended to be executed within a working directory
3632 5. Why can't I check out a file from within my working directory?
3646 working directory, the CVS administrative information provides most of
3660 I have to go to the top of my working directory and checkout some long
3675 directory becomes your working directory.
3690 The ./CVS/Repository file in each working directory contains a
3702 "working directory" information displayed by the "history" command.
3706 8. How can I lock files while I'm working on them the way RCS does?
3855 merge the other person's changes into your working file before
3918 You created your working directory by using "checkout -r V3", or you
3925 the CVS working branch, which is the branch to which "commit" will add
3970 Then, to put your working directory onto the branch, you type:
3988 commands to rename it and move your working directory onto the branch.
4048 To display the difference between a working file and its BASE
4053 To display the difference between a working file and a committed
4075 By default, "diff" displays the difference between your working file
4080 To display the difference between your working file and the latest
4093 to the latest revision on your working branch.
4101 4. How do I display the difference between my working file and what I
4215 last week, or are they still working blind?
4237 for integration usually wants to know who is working on what and what
4242 4. I deleted my working directory and "history" still says I have it
4246 history file for a working directory associated with a "module". If
4301 used to tag the entire checked-out working tree when there is no
4302 module defined to match the tree or when the working tree is the only
4317 cvs history -o -w What working directories have I created
4405 at the head of a checked out working directory and at the head of the
4453 If you are not working with 3rd party (i.e. Vendor) sources, you can
4516 any working directories you checked out earlier.
4631 files since the previous release, go into a working directory
4794 When you next execute "update" in any working directory you'll get the
4851 If you can, find out (or tell them) which working directory to use.
4852 You should verify that the working directory they use is on the Main
4856 you the output from "cvs update" in their working directory. You might
4865 If you didn't dictate which ones to use, find all working directories
4867 "commitinfo" log you set up might help to find checked out working
4877 If you find problems simply by looking at the source files and working
5005 consult a file kept under CVS in your working directory and make sure
5089 I can tell by this question that you were working in a time zone that
5174 able to "release" any file or sub-directory within my working directory.
5183 between files you consider part of your working set and files that
5189 portions of the working directory, but it isn't that way now.
5193 4. I removed the tree that I was about to start working on. How do I tell
5228 To remove a file from the working branch. It removes a file from the
5239 You'll have to remove the working directory and the matching directory
5242 Note that you want to do a _cvs remove dir_ in the working directory,
5315 have in a particular working directory, "rtag" is much handier for
5470 are working on and the existence of "sticky" information.
5503 updated or committed in a working directory.
5521 within the user's working directory. (Default is '.')
5533 committed) revision of each file found in the working directory. (The
5636 7. After a "tag <tag>" in my working directory, why doesn't "checkout -r
5678 You can also checkout or update your working directory to the <oldtag>
5700 To display the status of your working files.
5703 possibly altering your working directory. To see the status of your
5704 working files without changing anything, type:
5708 To merge changes made by others to the branch you are working on
5709 into your working files.
5711 Each working directory is attached to a branch, usually the Main
5712 branch. To merge changes made on your working branch since your last
5718 working on (your "working branch").
5730 (If you are working with a single file, the Tags could also be
5736 To move your working directory to another branch.
5738 A working directory is presumed to be attached to (or working on) a
5740 to be your working branch, you "move" to that branch.
5750 If you have modified files in your working directory, this is not a
5777 "checkout", "update" or "commit", into your working files. You can
5813 consider the Repository as the branch and your working directory as
5830 If no one has committed anything to the branch you are working on
5837 working files you are trying to "update".
5867 CVS thought you had in your working directory), then committed a
5893 working file to contain conflict markers surrounding the overlapping
5907 <<<<<<< <file> The working <file> in question.
5908 7777 Change made to the working <file>.
5955 A way to fix this is to "cd" into your working directory and type:
6025 in the working directory. The contents of the revision-controlled
6408 To find out what you've changed in your current working directory
6428 working directory with a '?' indicator.
6441 6. How do I merge changes made by others into my working directory?
6447 working on is the main purpose of the "update" command. The "update"
6450 working files.
6455 If the file is lying in your working directory, but is not under
6464 If you have made no changes to a working file, but you or others
6466 "update" or "commit" of this working file, CVS will remove your
6467 working file and replace it with a copy of the latest revision of that
6475 If you have made changes to a working file, but no one has changed
6484 If you have made changes to your working file and you or others have
6487 last "checkout", "update" or "commit" into your working file. "update"
6495 same output, since both the base file and your working file changed in
6523 or committed) you should "cd" to the head of the working directory you
6528 It recursively walks through your working directory tagging the BASE
6578 working on your branch.
6623 There is no reason to remove working directories, other than to save
6625 public, your working directory is just like any other directory.
6641 what branch you are working on.
6691 what inconsistencies exist in the working directory. If no
6696 The "tag" command works on the revision lying in the working
6738 While editing files, there is no conflict. You are working on separate
6740 working directories. After one of you commits a file, the other may
6742 committed changes into the later working file.
6745 to your working files. Your coworker commits revision 1.3. When you
6750 You must merge your coworker's changes into your working file by
6769 to merge the earlier changes into their working files before
6793 9. Where did the .#<file>.1.3 file in my working directory come from?
6796 Repository into your modified working file.
6813 Your old working file. (Before the update.)
6815 Your new working file. (After the merge caused by "update".)
6819 In the case where your working file was not modified, #1 and #3 will
6821 need to create #5. The following assumes that your working file was
7122 to start working. If you don't prepare first, you will probably spend
7131 working directory, which can be anywhere you have the space.
7219 1. Can I create non-CVS sub-directories in my working directory?
7264 CVS moves the file to the Attic associated with your working
7291 cd <working-dir>/<odir> rm <ofile>
7302 cd <working-dir>/<ndir>
7315 your <working-dir> to know about the name change.
7324 5. How do I make sure that all the files and directories in my working
7327 A "cvs update", or "cvs -n update" (which won't modify your working
7334 associated with your working directory, a second time into another
7335 work area and compare it to your working directory using the (non-CVS)
7352 The '-n' option will not allow "update" to alter your working
7359 Type this in your working directory:
7423 working directory via "update".
7520 committed (via "update") since you checked out your working copy of
7809 working areas of all developers.
7830 separately from the working files, in a directory hierarchy, called
7840 3. What is a working file?
7842 A working file is a disk file containing a checked-out copy of a
7843 source file that earlier had been placed under CVS. If the working
7849 4. What is a working directory (or working area)?
7851 A working directory is the place where you work and the place from
7854 The "checkout" command creates a tree of working directories, filling
7855 them with working files. Each working directory contains a
7860 contains information about working files.
7864 Repository that was used to create the working directory.
7868 the working directory.
7871 working directory:
7880 contains a fixed list of working files. If this file
7887 working directory is committed.
7893 working directory is updated.
7908 particular revision from a set of RCS files into your working area.
7909 You normally execute "checkout" only once per working directory (or
7910 tree of working directories), maintaining them thereafter with the
7938 on all files in a working directory, allowing you to retrieve those
7958 out, updated, or committed. If you have not modified your working
7980 working on the same branch.
7997 A checked-out working directory, can be treated like a private branch.
8144 else) into your working file. Both the "later" revision and your
8145 working file are presumed to have started life as a copy of the "base"
8151 others into your working file. In this case, the three files involved
8156 revision. Working: Your working file. The one lying in the working
8160 made on the given branch into your working files, which is presumed to
8166 difference between two specified revisions into files in your working
8184 track of source changes made by groups of developers working on the
8204 developers into your working files.
8212 user's working directory.
8233 merge the committed work of others into your working files you use the
8253 Multiple developers working on the same files.
8286 Your working directory can be treated as a private branch.
8297 work performed on the main branch into the branch you are working on.
8314 CVS does not dictate how to use disk space in the checked out working