Re: (no subject)

[Noel L Yap]

Merges need three versions to work with -- the two versions you see and their
ancestor (eg the version before code branched off).  If you have all three:
1. import the original code into the repo
2. checkout the code twice into different sandboxes
3. copy one branch into one sandbox
4. copy the other branch into the other sandbox
5. checkin one of the sandboxes
6. update (and resolve conflicts in) the other sandbox
7. checkin the other sandbox

Noel


|--------+-------------------------->
|        |                          |
|        |          address@hidden|
|        |          otmail.com      |
|        |                          |
|        |          06/27/01 03:58  |
|        |          PM              |
|        |                          |
|--------+-------------------------->
  >----------------------------------------------------------------------------|
  |                                                                            |
  |       To:     address@hidden                                             |
  |       cc:     (bcc: Noel L Yap)                                            |
  |       Subject:     (no subject)                                            |
  >----------------------------------------------------------------------------|






Hi,

A repository for my project was created some time back. But the development
work continued without checking out a working copy from the repository. Also
the development work divided into two branches thinking that CVS would help
merge at a later stage. Now is there any chance to merge these two branches
of development which have been created without using CVS?

Many thanks,
Deepak
_________________________________________________________________________
Get Your Private, Free E-mail from MSN Hotmail at http://www.hotmail.com.


_______________________________________________
Info-cvs mailing list
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs




This communication is for informational purposes only.  It is not intended as
an offer or solicitation for the purchase or sale of any financial instrument
or as an official confirmation of any transaction. All market prices, data
and other information are not warranted as to completeness or accuracy and
are subject to change without notice. Any comments or statements made herein
do not necessarily reflect those of J.P. Morgan Chase & Co., its
subsidiaries and affiliates.