On Mon, 4 Nov 2002, Tom Lane wrote: > "Marc G. Fournier" <[EMAIL PROTECTED]> writes: > > As I was unable to figure out a way of merging HEAD into a BRANCH > > (BRANCH into HEAD is easy), I moved the REL7_3_STABLE tag up to today, so > > that the BRANCH is in a more appropriate location. > > It looks like this was only 99.44% right. There are some files and > whole subdirectories that were deleted since REL7_3_STABLE was > originally branched, but your update did not mark them as deleted in the > branch: > > Only in REL7_3/pgsql/contrib: retep > Only in REL7_3/pgsql/contrib/xml: README > Only in REL7_3/pgsql/contrib/xml: pgxml.source > Only in REL7_3/pgsql/contrib/xml: pgxml_dom.source > Only in REL7_3/pgsql/doc/src/sgml: libpgeasy.sgml > Only in REL7_3/pgsql/doc/src/sgml: odbc.sgml > Only in REL7_3/pgsql/doc/src/sgml: recovery.sgml > Only in REL7_3/pgsql/doc/src/sgml: version.sgml > Only in REL7_3/pgsql/doc/src/sgml: y2k.sgml > Only in REL7_3/pgsql/src/interfaces/jdbc: CHANGELOG > Only in REL7_3/pgsql/src/interfaces/jdbc: Implementation > Only in REL7_3/pgsql/src/interfaces/jdbc: jdbc.jpx > Only in REL7_3/pgsql/src/interfaces/jdbc: utils > Only in REL7_3/pgsql/src/test/regress/expected: geometry-bsdi-precision.out > > Perhaps easiest to just re-delete them in the branch? Or is there a > cleaner way?
Easiest is to re-delete them ... from what i can tell from teh CVS docs, we did this backwards ... we should have worked on the branch itself, and then merges into the working tree ... something to remember for next time ---------------------------(end of broadcast)--------------------------- TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
