Hello all,
I'm new to the list, and hoped to lurk a bit more before sending out a
question, but I find myself in need of some help.
Some background: The CVS repository I am using was set up by someone
else. I've been told to start using it and to get a number of our
products under CVS control
>However, the
>crux of my problem was that whenever I've been importing their new
>changes into a module, I _never_ get a conflict message. This is
>important, because in most cases I _know_ a file has changed (usually
>index.htm).
Maybe I'm picking you up wrong in your description of the probl
Aha! That makes considerably more sense than what I was trying to
figure out on my own.
Since changes generally haven't been made to the local repository
copies, there have been no conflicts, but the Vendor history _is_ being
kept.
Thanks so much for your answer - I feel a lot better about how
On Fri, Dec 22, 2000 at 10:13:08AM -0600, Alexander Kamilewicz wrote:
> However, the
> crux of my problem was that whenever I've been importing their new
> changes into a module, I _never_ get a conflict message. This is
> important, because in most cases I _know_ a file has changed (usually
> in
Alexander Kamilewicz writes:
>
> I've read all about Vendor branches in Karl Fogel's book and in the
> Cederqvist and thought I knew what I was getting in to. However, the
> crux of my problem was that whenever I've been importing their new
> changes into a module, I _never_ get a conflict messa
Hi
I have a question about merging. I thought merging
with two -j options was 'from' revision and 'to'
revision.
This is what happened in my working area from trunk.
I have a file soa.pc, branched out at 1.2, now at
revision 1.2.4.1 on branch, and 1.2 on trunk. I
check-out from trunk, then do
cvs
Jeeva Sarma <[EMAIL PROTECTED]> wrote:
> I have a file soa.pc, branched out at 1.2, now at
> revision 1.2.4.1 on branch, and 1.2 on trunk. I
> check-out from trunk, then do
> [ ... ]
> cvs update -j 1.2 -j 1.2.4.1 soa.pc
Yes, like that. The command means, merge all changes
that occurred between
