[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Problem with merge.
From: |
David Tyler |
Subject: |
Problem with merge. |
Date: |
Tue, 01 Apr 2008 09:17:12 -0600 |
While running a merge from branch to trunk, a large number of files were
deleted by the merge that were not deleted on the branch. Looking at the tags
used for the merge, it appears that the files were missing the tag that marked
the end point for the merge. The problem I need to solve is restoring the
removed trunk files. I tagged the trunk prior to the merge, but running "cvs
update -j <post-merge-tag> -j <pre-merge-tag>" on the trunk does not restore
the removed files.
Thank you,
David Tyler
- Problem with merge.,
David Tyler <=