Folks,
I have two different repositories ( basically two trunks ) for the
same project. There are branches on both. I would like to merge branch
A on trunk 1 with branch B on trunk 2. Is this possible with cvs merge?
I tried to do this -
with trunk 2 as CVSROOT, cvs co -r B proj.
with trunk 1
Muk writes:
I have two different repositories ( basically two trunks ) for the
same project. There are branches on both. I would like to merge branch
A on trunk 1 with branch B on trunk 2. Is this possible with cvs merge?
No, CVS has no way to know what the relationship is between things
On Wed, Feb 23, 2005 at 11:03:03AM -0500, Larry Jones wrote:
No, CVS has no way to know what the relationship is between things in
different repositories. You could use ``cvs diff'' to get the changes
from the one repository and then use ``patch'' to apply them to a
working directory from the
Baurzhan Ismagulov writes:
There are many spurious hunks due to the usage of $Id$, $Log$, etc. Is
there an easy way to generate a diff without these hunks?
-kk
-Larry Jones
I can do that! It's a free country! I've got my rights! -- Calvin
___
On Wed, Feb 23, 2005 at 05:03:23PM -0500, Larry Jones wrote:
There are many spurious hunks due to the usage of $Id$, $Log$, etc. Is
there an easy way to generate a diff without these hunks?
-kk
Thanks :) !
With kind regards,
Baurzhan.
___
Hi
Anyone know of a script that can resolve conflicts (or any other nice
unix tool). Lets say you know that you should use all from one version
of the file and not the other. That should be quite easy to fix a script
for. (But I'm too tired now and need to hit the bed.) I really don't
want to do
PROTECTED]
Subject: CVS merge conflict
Hi
Anyone know of a script that can resolve conflicts (or any other nice
unix tool). Lets say you know that you should use all from one version
of the file and not the other. That should be quite easy to fix a script
for. (But I'm too tired now and need to hit
Title: Cvs merge problem
Hi,
I m facing very strange problem.Developers are working on their branch made from a development branch on trunk.
There are seven developers in the team. The problem developer facing is when their branch is merged in to the development branch the files which have
Please send mail only in Plain Text format.
There are seven developers in the team. The problem developer facing is
when their branch is merged in to the development branch the files which
have been changed earlier or updated in the development branch gets
updated with the changes from the
/2004 4:46 PM
To: '[EMAIL PROTECTED]'
Cc:
Subject:Cvs merge problem
Hi,
I m facing very strange problem.Developers are working on their branch made
from a development branch on trunk.
There are seven developers in the team. The problem developer facing is when
their branch
I think the problem is the start and end points of your merge.
If I have a trunk, and I created a branch from that trunk, tagging it at
the point it was created, I would use the following to merge the branch
back into the trunk:
-j branch_CREATED -j branch
Often this can simply be abbreviated
Hello All,
A file was added on a branch, and now I am unable to add it on the trunk or
on any other branch.
Could some one please help.
Thankyou very much in advance for the help.
Regards,
Rajesh
I am sorry if this is a repeat question and has been addressed before, if
yes Please point me to
On Tue, 11 Nov 2003 16:40:13 -0500, Patwardhan, Rajesh wrote
Hello All,
A file was added on a branch, and now I am unable to add it on the
trunk or on any other branch.
Just merge it like you would any other changes you made on the branch:
Hi,
I don't think my following merge result is correct. I
did a merge in branch1 to join branch2 as following
command:
branch1$ cvs -q update -Pd -kk -j branch1 -j branch2
There is only one file shown me the conflicts by
and comments embedded in the file.
Many other files in branch1 are
Hello all,
I have the problem where a file was added both on a Trunk and a
branch and CVS is giving me the foo.c exists, but has been added in
revision BAR error message when I try to do a merge. I have read many
posts about this subject, but the answer was always what causes this
message, not
On Fri, Mar 15, 2002 at 08:44:32AM -0800, Patrick Burleson wrote:
Hello all,
I have the problem where a file was added both on a Trunk and a
branch and CVS is giving me the foo.c exists, but has been added in
revision BAR error message when I try to do a merge. I have read many
posts about
Hello all,
I encountered this MERGING problem in CVS.
After BranchA was off from MAIN trunk, people created new files as well new
directories in BRANCHA but not in main. When I issued the merge, CVS
successfully added the new files in existing directories of BRANCHA but
failed to add new
Hi Guys :
I'm try to run the following command:
cvs -n update -l -jXXX
RCS file: /cvsroot/migration/makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
Merging differences between 1.2 and 1.2.2.1 into makefile
cvs server: makefile: No such file or directory
so I was tried:
cvs -n
Zanabria, Moises writes:
cvs -n update -l -jXXX
RCS file: /cvsroot/migration/makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
Merging differences between 1.2 and 1.2.2.1 into makefile
cvs server: makefile: No such file or directory
What are you trying to do? The -n global
That does mean that is no way to check a merge before I really want to
merge??
Moises
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Thursday, December 20, 2001 3:17 PM
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Subject: Re: cvs merge crash !!
Zanabria
In article [EMAIL PROTECTED], Zanabria, Moises wrote:
That does mean that is no way to check a merge before I really want to
merge??
A merge operation does nothing to the repository; all it does is edit your
local files. A separate commit step is necessary to put the results of
the merge into
Zanabria, Moises [EMAIL PROTECTED] writes:
That does mean that is no way to check a merge before I really want to
merge??
Yes there is. The merge isn't really over until you commit the
result. The entire process looks like this:
1) Check out a *clean* copy from the tip of the trunk. After
[EMAIL PROTECTED] writes:
Problem:
A file from the trunk had lines of code removed.
After doing the sync, I had expected to see the lines of code move in the
target file but they stayed put.
Based upon my simple understanding of how the merge works can anyone
explain what may have
All -
I've encountered a problem when trying to merge a trunk revision of a file
into a branch revision. Below is the background and description of the
problem.
Background:
It has been my understanding that CVS will merge according to the following
basic rules...
1. When code has been added
When does CVS consider a new file not new any more? A few of these files have been
modified and I would have thought they would have not been considered new anymore.
I have about 137 files that give me this message and they where all new files that
have been created in the last 3 months. The
John Mocyk wrote:
When does CVS consider a new file not new any more? A few of these files have been
modified and I would have thought they would have not been considered new anymore.
A file is new _within a workspace_ if the file was not checked out by CVS, but
created and 'cvs add'ed, and
I get this message when I am trying to update a branch (same message if
from a static tag or branch) and it seems to occur with some of the new
files.
The branch is just a project that is being worked on and the statictag
is a tag of what was released into production and is code at production
Is there any way to stop CVS from always trying to merge your code?
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
On Wed, Dec 06, 2000 at 11:16:09AM -0500, Largent, Jim wrote:
Is there any way to stop CVS from always trying to merge your code?
Why would you want to do that? (serious question, what are you trying to
accomplish?)
I can think of two things:
You don't want to keep your changes.
You don't
Mike Castle wrote:
-snip-
If you need to commit and others have changed the file too, and you are
certain, VERY VERY CERTAIN that you don't want those changes, then rename
your file, cvs update, copy your renamed file over the file just checked
out, then commit. THIS WILL LOSE CHANGES!
Lan Barnes wrote:
Mike Castle wrote:
If you need to commit and others have changed the file too, and you are
certain, VERY VERY CERTAIN that you don't want those changes, then rename
your file, cvs update, copy your renamed file over the file just checked
out, then commit. THIS WILL
On Wed, Dec 06, 2000 at 02:08:23PM -0600, Brett Neumeier wrote:
Yes; that would be more accurate. Changes are not being lost; they
are just being removed from the head revision.
But how soon will you notice this?
This should definitely be the exception, not the rule.
If this is happening
PROTECTED]
cc: (bcc: Noel L Yap)
Subject: CVS Merge Algorithm
Hey all..I'm sure this is in a FAQ somewhere because I thought I saw it
once. I'm trying to enlighten my team about the ways of CVS and when I said
it can automatically merge code alarm bells went off all around. I'm sure
many of you
on the
CVS merge algorithm and a statistics page about false positives and error
percentages when using the automatic merge?
Thanks,
Chris
--
Chris Hirsch http://www.Tecomac.com
[EMAIL PROTECTED] What? Me Worry? Linux Inside
INSERT RANDOM
34 matches
Mail list logo
