Mailing List Archive: Zope: Coders

checking in on a branch?

Index | Next | Previous | View Threaded

steve at cat-box

Oct 4, 2001, 7:11 AM

Post #1 of 6 (263 views)
Permalink

checking in on a branch?

Hi folks,

This was supposed to check in on a branch:

<http://lists.zope.org/pipermail/zope-checkins/2001-October/007915.html>

From the cvs-checkins email, it looks like it went into the trunk.
Oops, sorry.

Here's what I did:

1: I checked out a fresh Zope into a sandbox

cd ~/zope_coder
mkdir sandbox
cd sandbox
cvs -d :ext:stevea [at] cvs:/cvs-repository co Zope

2: I created a branch to work on

cd Zope
cvs tag -b stevea_zcatalog_api_cruft_cleanup-branch

3: I changed the file

4: I checked in the changed file

cd lib/python/Products/ZCatalog/dtml
cvs commit manageIndex.dtml

# enter message in vi

I'd been following the instructions here:

http://dev.zope.org/CVS/ZopeCVSFAQ
----
How do I do my work on the branch?

You work in your branch in the same way you would work in any CVS
sandbox. You make your changes and use cvs commit to commit your
changes. When you commit on a branch, the changes are only committed to
that branch. The changes won't be visible in the trunk or in other
branches until you explicitly merge the changes from your branch into them.
----

Was I supposed to check out the branch between steps 2 and 3?

--
Steve Alexander

evan at zope

Oct 4, 2001, 7:14 AM

Post #2 of 6 (258 views)
Permalink

Re: checking in on a branch? [In reply to]

Steve Alexander wrote:

> 2: I created a branch to work on
>
> cd Zope
> cvs tag -b stevea_zcatalog_api_cruft_cleanup-branch
>
> 3: I changed the file
>
> Was I supposed to check out the branch between steps 2 and 3?

Yep. Step 2 creates the branch, but doesn't affect your sandbox.

Cheers,

Evan

steve at cat-box

Oct 4, 2001, 7:16 AM

Post #3 of 6 (262 views)
Permalink

Re: checking in on a branch? [In reply to]

Steve Alexander wrote:

> Hi folks,
>
> This was supposed to check in on a branch:
>
> <http://lists.zope.org/pipermail/zope-checkins/2001-October/007915.html>
>
> From the cvs-checkins email, it looks like it went into the trunk.
> Oops, sorry.

Aha... I forgot this vital step:

cvs update -r my_project-branch

--
Steve Alexander

brian at zope

Oct 4, 2001, 7:19 AM

Post #4 of 6 (260 views)
Permalink

RE: checking in on a branch? [In reply to]

> > 2: I created a branch to work on
> >
> > cd Zope
> > cvs tag -b stevea_zcatalog_api_cruft_cleanup-branch
> >
> > 3: I changed the file
> >
> > Was I supposed to check out the branch between steps 2 and 3?
>
> Yep. Step 2 creates the branch, but doesn't affect your sandbox.

right - you want to do:

- (create the branch)
cvs tag -b stevea_zcatalog_api_cruft_cleanup-branch

- (move the sandbox onto the branch)
cvs up -d -P -r stevea_zcatalog_api_cruft_cleanup-branch

-Brian

steve at cat-box

Oct 4, 2001, 7:23 AM

Post #5 of 6 (258 views)
Permalink

Re: checking in on a branch? [In reply to]

Steve Alexander wrote:

> Steve Alexander wrote:
>
>> This was supposed to check in on a branch:
>>
>> <http://lists.zope.org/pipermail/zope-checkins/2001-October/007915.html>
>>
>> From the cvs-checkins email, it looks like it went into the trunk.
>> Oops, sorry.
>
> Aha... I forgot this vital step:
>
> cvs update -r my_project-branch

So... what should I do next?

Officially, I guess I should back out the change from the Trunk, and
stick it back in the branch where it should be.

Pragmatically, it is a tiny tiny isolated bugfix, so I could check the
same fix into the release branch, and amend CHANGES.txt.

I think the latter is better. Can I get an "ok" from someone at ZC?

How would I go about backing out a change anyway?

--
Steve Alexander

brian at zope

Oct 4, 2001, 7:29 AM

Post #6 of 6 (258 views)
Permalink

RE: checking in on a branch? [In reply to]

> So... what should I do next?
>
> Officially, I guess I should back out the change from the Trunk, and
> stick it back in the branch where it should be.
>
> Pragmatically, it is a tiny tiny isolated bugfix, so I could check the
> same fix into the release branch, and amend CHANGES.txt.
>
>
> I think the latter is better. Can I get an "ok" from someone at ZC?

Ok :)

> How would I go about backing out a change anyway?

It's not easy or fun - a good CVS book is probably the best resource
there :) You basically would need to manually revert all of the files
you changed to the version before the change.

For big changes, it can be a good idea to tag the head or branch that
you are merging _into_ before attempting the merge (brian-pre_oops_tag).

That way in the worst case, you can check out a sandbox based on your
oops tag and diff files with the screwed files (in another sandbox).

Luckily, we've been able to coordinate a fairly large number of people
in various parts of the world for some time now without having had to
do a major painful backout. :)

Brian Lloyd brian [at] zope
Software Engineer 540.361.1716
Zope Corporation http://www.zope.com

Index | Next | Previous | View Threaded

Interested in having your list archived? Contact Gossamer Threads