[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: commit one branch changes to another branch
From: |
Jim Hyslop |
Subject: |
Re: commit one branch changes to another branch |
Date: |
Tue, 31 Jan 2006 09:51:28 -0500 |
User-agent: |
Mozilla Thunderbird 1.0.6 (Windows/20050716) |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Meir wrote:
> dose anyone know how can I commit all branch changes to another branch
> ?
> I want to avoid the resolving merges in case of update -j -j , , just
> overide a branch with another branch sources but also handle
> removed/added files
Well, if it wasn't for the added/removed files, 'cvs ci -r
desired_branch' would do it.
In your case, I'd suggest you create a temporary branch, check into that
branch (using the above command) then refer to this item in the FAQ:
http://ximbiot.com/cvs/wiki/index.php?title=CVS_FAQ#How_do_I_replace_branch_A_with_the_contents_of_branch_B.3F
or http://tinyurl.com/7gh4t
- --
Jim Hyslop
Dreampossible: Better software. Simply. http://www.dreampossible.ca
Consulting * Mentoring * Training in
C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFD33lwLdDyDwyJw+MRAhALAJ9NNrJpIpF9TgCbh3r50oqqzw9ZbgCguw+9
ZlDc0tB4G4WGq9O/Cd3rxsA=
=PK33
-----END PGP SIGNATURE-----