Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to firstname.lastname@example.org.
1. If I add a file (file2.txt in example) initially on branch, then the first mergepoint (from release branch to main branch) is missing. 2. A file (file1.txt) is marked as changed, on merge to a second branch but the file is equal as the existing. normally an update resets files marks if nothing is changed, but not in this case. i hope the example help to find the problems/bugs, Thomas. EXAMPLE: # create release file cvs -q add file1.txt cvs -q commit -m "message" file1.txt cvs -q tag -r 1.1 rel-1-0 file1.txt cvs -q tag -b rel-1-0-patches file1.txt cvs update -r rel-1-0-patches # some changes in patch branch # on file1.txt # and add second file cvs -q commit -m "changed patch file" file1.txt cvs -q add file2.txt cvs -q commit -m "new patch file" file2.txt # merge to patch to main branch cvs update -A cvs update -d -j rel-1-0 -j rel-1-0-patches cvs -q commit -m "merge files" file1.txt file2.txt # merge point on file2 is missing # same problem if merge goes to other branch cvs -q tag rel-2-0 cvs -q tag -b rel-2-0-patches cvs update -r rel-1-0-patches # add third file cvs -q add file3.txt cvs -q commit -m "new patch file" file3.txt cvs -q update -r rel-2-0-patches cvs -q update -d -j rel-1-0 -j rel-1-0-patches # file1 marked as changed but isnt changed. cvs -q commit -m "merge files" file1.txt file3.txt # merge point on file3 lost