From: "Bart Schaefer" <schaefer@candle.brasslantern.com>
To: Adam Spiers <adam@spiers.net>,
Zsh hackers list <zsh-workers@sunsite.auc.dk>
Subject: Re: CVS (slightly off-topic)
Date: Sat, 18 Sep 1999 07:04:52 +0000 [thread overview]
Message-ID: <990918070452.ZM54@candle.brasslantern.com> (raw)
In-Reply-To: <19990916164622.B17248@thelonious.new.ox.ac.uk>
On Sep 16, 4:46pm, Adam Spiers wrote:
} Subject: Re: CVS (slightly off-topic)
}
} For reference, in case anyone in the future who hasn't already is
} thinking of going down the CVS route, and is reading this thread,
} something to be wary of is that if you do more than one import onto a
} vendor branch, you have to check for any files present in the first
} import but not the second. Do a `find . -print | sort' in both
} directories, and then do a
}
} cvs remove -f `comm -23 filelist_a filelist_b`
}
} on the respective outputs.
If you found that you needed to do this, then you've done something else
wrong, or you have a really old version of CVS. This should be handled
for you by the import and merge process.
(The first thing you did wrong was "find . -print | sort" instead of
"print -l **/*(D)", but that has nothing to do with CVS.)
I'm assuming you did something like this:
import vendor-rev-A
checkout trunk
import vendor-rev-B
import vendor-rev-C
update trunk
The correct way to update the trunk sandbox in that instance is to do BOTH:
cvs update
cvs update -jvendor-rev-A -jvendor-rev-C
The plain "cvs update" will add any new files from rev-B or rev-C that
are not in rev-A. The "cvs update -j... -j..." will merge changes to
any other files since rev-A, including removing any files no longer
present at rev-C.
The import of rev-C should itself have removed any files new at rev-B
but that are no longer present in rev-C.
The one case where this might fail is when you have modified (but not
committed) a rev-A file in your sandbox that is one of those removed at
either rev-B or rev-C. In that case you should get a conflict report
at the "cvs update -j... -j..." stage, which you will have to resolve
(possibly by using "cvs remove"). It's best to commit everything you
possibly can *before* doing the merge.
I'd actually update, resolve conflicts, and commit after EACH import,
rather than doing two imports in a row; but that's just to minimize the
size of the conflicts I might have to resolve.
} I also had one weird conflict error reported in Completion/User/_cvs
} when I imported 3.1.6-pws-4 which I had to deal with manually. No
} idea why.
If you've applied any patches from the list to your trunk sandbox,
"cvs import" may report conflicts. They're not real conflicts unless
they're also reported by "cvs update -j... -j...", in which case they
might mean that PWS tweaked something without posting it, or that you
missed a patch, or that PWS missed one.
--
Bart Schaefer Brass Lantern Enterprises
http://www.well.com/user/barts http://www.brasslantern.com
prev parent reply other threads:[~1999-09-18 7:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
1999-09-06 10:19 3.1.6-pws-3 Peter Stephenson
1999-09-06 11:18 ` 3.1.6-pws-3 Andrej Borsenkow
1999-09-07 16:29 ` 3.1.6-pws-3 Bart Schaefer
1999-09-08 9:00 ` CVS Peter Stephenson
1999-09-08 10:40 ` CVS (slightly off-topic) Adam Spiers
1999-09-08 13:44 ` Ollivier Robert
1999-09-08 17:26 ` Bart Schaefer
1999-09-08 20:03 ` BK & " Wayne Davison
1999-09-08 22:30 ` Bart Schaefer
1999-09-09 0:01 ` Wayne Davison
1999-09-09 7:44 ` Ollivier Robert
1999-09-09 19:01 ` Wayne Davison
1999-09-16 15:46 ` Adam Spiers
1999-09-18 7:04 ` Bart Schaefer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=990918070452.ZM54@candle.brasslantern.com \
--to=schaefer@candle.brasslantern.com \
--cc=adam@spiers.net \
--cc=zsh-workers@sunsite.auc.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).