I am sure, this is considered a dumb question, but I have to ask it.
| CVS branch names:
| Branch leading
| up to branch tag release tag branch from
| 2.0 netbsd-2-0 netbsd-2-0-RELEASE HEAD
| 2.1 netbsd-2 netbsd-2-1-RELEASE netbsd-2-0-RELEASE
| 2.2 netbsd-2 netbsd-2-2-RELEASE (no new branch)
| 2.0.1 netbsd-2-0 netbsd-2-0-1-RELEASE (no new branch)
This makes me think:
For only getting bugfixes for 2.0 ...What are branch in cvs?
What contain various cvs present in cvs?
...postgresql anonymous cvs?
Can somebody point me to it?
---------------------------(end of broadcast)---------------------------
TIP 3: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to email@example.com so that your
message can get through to the mailing list cleanly
On Fri, May 28, 2004 at 10:49:33AM -0700, Mark Harrison wrote:
> Can somebody point me to it?
Alvaro Herrera (<alvherre[a]dcc.uchile.cl>)
"La gente vulgar solo piensa en pasar el tiempo;
el que tiene talento, ...SVN/CVS and Branching
Hello. I am curious about different ideas on how you handle branching
your python projects. With some other languages this is trivial, but
since python uses these directories as modules and i have the top
level module starting imports all over the place, i am wondering what
others do. In the past we had retired the first branch and just moved
towards the new, but that is not possible now.
...WIN32_DEV CVS branch
We are no longer using the WIN32_DEV CVS branch. We are doing all Win32
work in HEAD now. I have already moved any WIN32_DEV changes up into
HEAD. I have updated the Win32 web page to indicate this:
Marc, would you remove the nightly generation of the win32 tarballs?
Thanks. I assume we can't remove the branch itself.
Bruce Momjian | http://candle.pha.pa.us
firstname.lastname@example.org | (610) 359-1001
+ If your life is a hard drive, | 13 Roberts Road
+ Chri...Merging branches in CVS
I have a problem with merging branches in CVS (WinCVS). I have two
branches A and B. What I want to do is make a change on branch A, merge
it onto the trunk and from the trunk merge it onto branch B. Assume the
file is test.txt then what I have done is the following.
<go to branch A and update test.txt>
cvs commit test.txt
<go to trunk>
cvs update -j A
<go to branch B>
cvs update -j HEAD
Before starting the test.txt file is identical in A, B, and the trunk.
After this sequence of operations I would like this to be the case as
well. The updat...CVS branching question
using CVS I have the following problem.
The big picture:
We have a piece of software that's just about in all
our applications. Over the time it has become rather
stable with only relatively few checkins per month.
Projects using it usually update it from the trunk,
until they get into a "hot phase", where they branch
off in order to not to risk getting any instable
updates from the trunk.
What I've done:
During the last few weeks I have been developing an
incompatible change in that piece of software on a
branch "New". From time to time I ha...cvs: choosing the branch
i hope is't not NTG...
I tagged sources:
#cvs tag release-1-0 .
created new branch from that point:
#cvs tag -b -r release-1-0 release-1-0-experimental project1
then i checkout this new branch
#cvs checkout -r release-1-0-experimental
edited some files, and now i want to commit changes to that branch.
If i make:
to what branch will be theese changes saved ?
i am confused, because changes were made, and when i next time
checkout 'main trunk':
i saw that changes, and i would like to see them only in
release-1-0-experimental branch (cvs checkout -r
r...CVS Branching with Eclipse
I'm building a web application with Eclipse and want to utilize the CVS
branching to support coding new larger scale functionality while also
being able to make and deploy minor changes. My experience with CVS is
limited but from my reading it seems like branching and merging is what
What I've done so far is Tagged the code and then branched it (new
branch is V1_1). I've been playing around and can't seem to figure out
what the proper way to make changes is and then merge them.
If someone could give some tips on how I should:
a) Make a change to the "..../prepare missing from cvs download?
The cvs download of 4.6rc1 does not include a ./prepare file to setup the
I can build 4.6rc1 on Linux using a non cvs download. The non cvs download
contains a ./configure file.
Am I missing something or overlooking something?
Thanks in advance,
Alex van der Spek
Alex van der Spek wrote:
> The cvs download of 4.6rc1 does not include a ./prepare file to setup
> the ./configure file?
Supported release versions of gnuplot do not require a ./prepare
script. Just run ./configure and you're all ready. That includes 4.6rc1.
Having said that...WSAD CVS branch error
I am not sure whether I am post to the right group, please enlighted me if I am not.
I am using WSAD 5.0 to branch a module in CVSNT but fails.
The procedure is
-get the latest from the HEAD stream
-select the module, right click -> branch
-enter branch name, in the progress window, it shows "Error Branching
Resources Reason: IO interrupted" as attached.
Please help, it almost kills me.
Thanks in advance for any ideas and input.
...CVS: Diffing from HEAD into a branch
Say I'm working on a branch. I want to see what has changed on the main
trunk, so I can merge it into the branch. But if I do:
cvs diff -r HEAD
it doesn't compare my files to the main trunk; it just compares them to
the current branch.
I've seen some other posts saying that this is a known issue with cvs
diff, but I haven't found out what the workaround is. How do you see
what's changed in the HEAD when you're working on a branch?
> Say I'm working on a branch. I want to see what has changed ...How to maintain CVS branch with tag???
I've got a problem,a software,just call it SomeSoft,SomeSoft 1.0 has been
released,it's developed and maintained by CVS.
Now some bugs feedback from beta users,I need to fix them,meanwhile,I need
to do some enhancements,so I need to make 2 branches:
Bug fixing---SomeSoft 1.5
I want to make a tag for them and merge the 2 reversions in the end,but
after adding tag,I can not commit what I modified,
what's the problem?
>>>>> "hoop" == hoop <...Newbie: Merging branches in CVS
I have a file modified on the trunk and at
the same time modfied on branch B. I tagged
the file on the trunk with tag T, merged the
file from the branch into the trunk, and
tagged the file on the branch with tag B'.
Now the file was modified again on the
branch, so that I need to merge again.
How can I merge so that only changes made
after tag B' will be merged into the trunk?
What I tried is this:
cvs -q update -P -jB -jB' file
However, this doesn't do what I want.
SpamTrap@gmx.de is never read
I'm Schobi at suespammers ...