|
|
| <prev next> |
Choosing A Webhost: |
Feature request: commit to / update from directories: msg#00001version-control.codeville.devel
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> |
|---|---|---|
| Previous by Date: | Version 0.8.0 released, Ross Cohen |
|---|---|
| Previous by Thread: | Version 0.8.0 released, Ross Cohen |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
Free MagazinesCisco NewsReceive 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 |