bug-cvs
[Top][All Lists]
Advanced

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

Re: cvs vs cvsnt and trunk to branch merge problem


From: Derek Robert Price
Subject: Re: cvs vs cvsnt and trunk to branch merge problem
Date: Fri, 29 Aug 2003 13:34:52 -0400
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030624 Netscape/7.1

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

das deniz wrote:

|4) MERGE THE FIRST TAG OUT TO THE BANCH
|
|cvs up -r my_module_branch
|
|(new_file.c disappears - now the working area is for the branch)
|
|cvs up -j first_tag
|
|(new_file.c comes back with no RCS version - cvs status new_file.c)
|
|cvs ci -m "committing merge of first_tag into branch results"
|
|(creates rev 1.2.2.1 of new_file.c  !!!????)
|
|WHY ISN'T THIS REV 1.1.2.1 or something based of the rev related to
first_tag?


Because the branch tag didn't actually exist in this file and CVS
defaults to grabbing the latest version.  By the time you commit this
file CVS no longer remembers the details of the merge and, lacking a
branch tag, creates the new version of the file on the branch based on
the most recent trunk version.

This would not be easy to change.

|5) MERGE THE BRANCH BACK INTO THE TRUNK
|
|cvs up -A
|cvs up -j my_module_branch
|cvs ci -m "merge of my_module_branch into trunk"
|
|(creates rev 1.3 of new_file.c with contents of rev 1.1)


This though, is suprising and almost certainly not what the merger
desired.  I'm not quite certain how to go about fixing it.  Is this
another argument for always creating dead revisions as branch bases for
added files?  Perhaps for all files always having a dead 1.1?

The workaround is to tag the base of your branch, e.g.
`my_module_branch_base' in this example, then do your merge like:


~    cvs up -j my_module_branch_base -j my_module_branch


Of course base tags can be hard to recreate retroactively.  It'd be nice
if someone could port forward and finish Steve Cameron's .trunk, .parent
, .etc patch.  If someone could simply port it forward, perhaps it could
be committed to 1.12.x at this point?  This should give us some time to
work out the bugs on feature before it goes into production.

Derek

- --
~                *8^)

Email: address@hidden

Get CVS support at <http://ximbiot.com>!
- --
I am not a 32 year old woman.
I am not a 32 year old woman.
I am not a 32 year old woman...

~          - Bart Simpson on chalkboard, _The Simpsons_
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQE/T467LD1OTBfyMaQRAswuAJwMjan0W/wPrGZJtm8UVhH1NyhOsACfUA2w
va8qP5IRzJRHrTphGGXUS74=
=qwFT
-----END PGP SIGNATURE-----






reply via email to

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