Please take our Survey
logo       

Choosing A Webhost:
A web hosting service is a type of Internet hosting service that allows individuals and organizations to provide their own website accessible via the World Wide Web. Web hosts are companies that provide space on a server they own for use by their clients as well as providing Internet connectivity, typically in a data center. Web hosts can also provide data center space and connectivity to the Internet for servers they do not own to be located in their data center, called colocation. more...

Feature request: commit to / update from directories: msg#00001

version-control.codeville.devel

Subject: Feature request: commit to / update from directories

I'd like to be able to pull changesets between local branches without
having to round-trip to the server. Basically, when I've got two
branches, a stable branch for bug fixes and a development branch, I
often discover a small bug in the course of working on the development
branch that should be fixed in the stable branch, because it is a
small bug fix, but also needs to be fixed in the development branch
because it's interfering with the larger work I'm doing. Usually I
end up doing this:

cd stable-branch/
... fix bug ...
cdv commit
cd ../development-branch/
cdv update -R cdv://server/stable-branch/
cdv commit

This is fine, normally, but it has a few drawbacks:

* It generates an extra changeset for the merge, which clutters the
history and pesters my workmates with commit emails. I'd rather
just keep working and commit all of the bug-fixes from the stable
branch into the development branch in one bunch.

* It's not possible when working offline, say while on a plane or on
vacation (which I have done a lot of lately).

* It makes it impossible to have multiple branches of a project that
is totally server-less.

The other alternative is to generate a diff of the change from one
branch and then apply it, which just ends up mixing the changes from
the bug fix in with whatever uncommitted changes I've made in the
development branch.

If I could point the -R option at a directory in addition to a server,
and pull in whatever changes in that directory are not in the currrent
directory, that would solve these problems. It would go like this:

cd stable-branch/
... fix bug ...
cdv commit # (or commit -n if I'm working offline)
cd ../development-branch/
cdv update -R ../stable-branch/ # pull in change sets from other branch
... keep developing, possibly repeat this process ...
cdv commit # (or commit -n if I'm working offline)

Commit would work the same way:
cdv commit -R ../development-branch/

What do people think?

-matt


<Prev in Thread] Current Thread [Next in Thread>
Google Custom Search

Recently Viewed:
qplus.devel/200...    network.jabber....    debian.qa-packa...    encryption.gpg....    python.dabo.dev...    uclinux.devel/2...    science.mathema...    recreation.pesc...    kernel.ck/2004-...    mozilla.devel.e...    tex.latex.prosp...    ietf.multi6/200...    bbc.cvs/2002-11...    xfree86.newbie/...    jakarta.taglibs...    altlinux.hardwa...    comedi/2002-05/...    horde.bugs/2004...    games.diplomacy...    finance.e-gold....    web.dom.test-su...    lang.ruby.rails...    os.netbsd.devel...    video.gstreamer...   
Home | advertise | OSDir is an inevitable website. super tiny logo

Free Magazines

Cisco News
Receive a free quarterly e-newsletter with exclusive articles on how Cisco IT uses its own products and solutions to enable the business.
subscribe

Systems Management News, the newspaper for IT systems administration and data center managers! Each issue of Systems Management News is chock-full of news and analysis to help you understand what's happening in your field.
subscribe

The Enterprise Newsweekly eWeek is the essential technology information source for builders of e-business.
subscribe

Oracle Magazine Oracle Magazine contains technology strategy articles, sample code, tips, Oracle and partner news, how to articles for developers and DBAs, and more. Oracle (NASDAQ: ORCL) is the world's largest enterprise software company.
subscribe

Total Telecom Total Telecom is "The Economist of the communications industry".
subscribe

Navigation