New VCS Choice; SCM SIG
Josh Boyer
jwboyer at jdub.homelinux.org
Mon Jan 22 22:20:44 UTC 2007
On Mon, 2007-01-22 at 14:07 -0800, Toshio Kuratomi wrote:
> On Fri, 2007-01-19 at 10:20 +0100, Karel Zak wrote:
> > On Thu, Jan 18, 2007 at 02:50:15PM -0800, Toshio Kuratomi wrote:
> > > == Workflow for the VCS ==
> > > * jcollie has started a page that abstracts our current workflow with
> > > cvs-dist:
> > > http://fedoraproject.org/wiki/Infrastructure/VersionControl/Operations
> >
> > This is very minimalist list of operations, I also use:
> >
> > * diff between branches
> Can you give an example commandline of this? I'm not quite sure what it
> means in the context of the package SCM.
cvs diff -Nau -r branch_1 -r branch_2 foo.c
git diff branch_1..branch_2
(sorry I don't know hg)
> > * test new patches in private topic branch(s)
> > * merge branches
> Added these two although my impression is that it wouldn't be very easy
> to do this with cvs. Are you doing this with our current SCM or is it
> something you want to make sure is made easy when we change to a new
> SCM?
cvs co -r branch_1 foo.c; cvs up -dP -j branch_2 foo.c; cvs commit
git checkout branch_1; git pull . branch_2
josh
More information about the fedora-devel-list
mailing list