us
synchronize all the time.
Regards,
Giovanni Giazzon
- Original Message -
From: Matthew Herrmann [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Sent: Tuesday, June 03, 2003 5:03 AM
Subject: Re: The idea isn't clear...
Hi Giovanni,
The only way to prevent
To: [EMAIL PROTECTED]
Cc: Matthew Herrmann
Subject: Re: The idea isn't clear...
Hi Matthew,
I agree with you. That's why we've decided to use CVS. Besides those
conflicts problems, we have a gain in productivity since we do not have to
wait for a developer to stop editing a file. Unfortunately
: The idea isn't clear...
Eclipse goes one further and gives you an opportunity to synchronise in a
clean area, where you can review changes that come in before they are
automatically merged. This is better than vanilla CVS, though it is a bit
slower to handle over dial-up.
It should be called
[ On Friday, May 30, 2003 at 12:36:21 (-0400), Eric Siegerman wrote: ]
Subject: Re: The idea isn't clear...
I suspect that the above diff hunk is an unrelated change. It
seems unrelated to the conflict-marking style.
Yes, actually it is -- the stat() is there so that one more un-related
, June 02, 2003 2:12 AM
Subject: Re: The idea isn't clear...
Eclipse goes one further and gives you an opportunity to synchronise
in a clean area, where you can review changes that come in before they
are automatically merged. This is better than vanilla CVS, though it
is a bit slower to handle
: Giovanni Giazzon [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Subject: Re: The idea isn't clear...
Message-ID: [EMAIL PROTECTED]
References:
[EMAIL PROTECTED]000d01c32561$8
[EMAIL PROTECTED]
[EMAIL PROTECTED]
Content-Type: text/plain;
charset=iso-8859-1
MIME-Version: 1.0
Content-Transfer
On Wed, May 28, 2003 at 07:29:58PM -0400, Greg A. Woods wrote:
[ On Wednesday, May 28, 2003 at 15:24:09 (-0700), Jim wrote: ]
stuff
===
other stuff
It's one hell of a lot easier to tell what's going on with conflicts if
you fix CVS to call diff3 in such a way that it includes
Subject: Re: The idea isn't clear...
demand, you might have logical concurrence in different implementations.
But, is this right? That's the way to work with CVS?
No - actually everyone works on the same branch(trunk)(path?),
occasionally
when you go to commit there could be times where
Hi all,
I'm quite new to CVS, and I'm having some difficulties to understand it's
logic. I have a project in the HEAD section, and I've created a branch to
each developer. So they work on it, commit on it, and we are all happy, but
when comes the time to generate a new version and merge each
Why does each developer need his or her own branch.
Just pull a workspace and have the developer treat his
local workspace as a branch. That way whoever commits
first forces everyone else to auto-update and pull in
the changes... Instead of waiting till the end.
donald
On Wed, May 28, 2003
demand, you might have logical concurrence in different implementations.
But, is this right? That's the way to work with CVS?
No - actually everyone works on the same branch(trunk)(path?), occasionally
when you go to commit there could be times where someone else has already
commited changes,
[ On Wednesday, May 28, 2003 at 15:24:09 (-0700), Jim wrote: ]
Subject: Re: The idea isn't clear...
stuff
===
other stuff
though I'm not sure whether the top or the bottom is more recent... it's
ususally easy to tell which is the correct one...
It's one hell of a lot easier
--- Forwarded mail from [EMAIL PROTECTED]
It's one hell of a lot easier to tell what's going on with conflicts if
you fix CVS to call diff3 in such a way that it includes the full
conflict information:
[context diff omitted]
This should have been changed years ago.
--- End of forwarded
13 matches
Mail list logo
