[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Files from Attic reappear when merging a branch
From: |
AS/EAB |
Subject: |
Files from Attic reappear when merging a branch |
Date: |
Tue, 30 Aug 2005 15:58:06 +0200 |
Hi
I'm experiencing a problem with cvs update:
When merging a branch on to main trunk, all the files from Attic
reappear in the merged module. The files in Attic where removed long
before the branch was created and therefore I cannot understand why they
should reappear at the merge. Is this a bug in CVS?
The merge is done as follows:
1. Check out the module on main trunk (cvs co).
2. Merging the branch with a specific branch tag (cvs update -j <branch
tag>).
At this point all the Attic-files reappear in the merged module. But
why?
No files have been added/removed on main trunk, nor the branch, after
the branch was created.
I would greatly appreciate any help on this matter.
Kind regards
/Stefan Näslund
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Files from Attic reappear when merging a branch,
AS/EAB <=