Click here to Skip to main content
11,790,880 members (63,199 online)

Application Lifecycle

AnswerRe: Benchmark deviations Pin
jschell4-Oct-12 11:47
memberjschell4-Oct-12 11:47 
GeneralRe: Benchmark deviations Pin
S. Becker5-Oct-12 2:00
memberS. Becker5-Oct-12 2:00 
GeneralRe: Benchmark deviations Pin
Richard MacCutchan5-Oct-12 2:52
mvpRichard MacCutchan5-Oct-12 2:52 
GeneralRe: Benchmark deviations Pin
jschell5-Oct-12 9:55
memberjschell5-Oct-12 9:55 
AnswerRe: Benchmark deviations Pin
S. Becker22-Oct-12 21:33
memberS. Becker22-Oct-12 21:33 
QuestionTFS build best practise Pin
tomas.ivan2-Sep-12 21:19
membertomas.ivan2-Sep-12 21:19 
AnswerRe: TFS build best practise Pin
jschell4-Sep-12 12:15
memberjschell4-Sep-12 12:15 
QuestionMercurial: Pushing and Pulling Between Local Branches Pin
Mike-MadBadger4-Jul-12 7:25
memberMike-MadBadger4-Jul-12 7:25 
I have just started using Mercurial, for a website project in this case.
It is all done on a local repo (backed up), not using BitBucket (or similar host).

This is my first step into version control beyond keeping sepearte folders, one for production (essentially a static folder representing the current live state) and one for development (both feature updates and content). The prior approach was beginning to give me all kinds of headaches when I had an incomplete feature but needed to update the content, keeping the two folders in sync (for content only) was horrid.

I started by doing the features in a clone and content updates in the original. Then Pulling the Feature clone into the original clone (and managing conflicts was a pita but not really that bad), but have now switched to using named branches and it's working absolutely fine. I haven't tried bookmarks yet, simply haven't found a reason that has caused me to understand what they do differently to named branches).

===The Question===
The one thing I can't work out how to do is to move single changesets from one branch to another. Let's say I have a feature branch that has 5 changesets but is incomplete, then I need to make a bug fix to the live site. I make the bug fix in the default branch and want to push it into the feature branch but without merging - otherwise the merge would have an incomplete (broken) feature!

===Extra Info===
For clarity I need to get the bug fix out to the live server and whilst I might do the work in a new branch, once done it would get merged back into the default, so once again I'd have two branches, default and the feature branch.

I think, from descriptions I have read (but haven't tried), that this kind of thing is pretty easy to do when you are using BitBucket (or similar host), you just pull the specific changeset (and its history) into your local clone. So I imagine it's also easy to do so between local clones (again I haven't tried it), but for lone nor money i can't work out how to do it within a single repo - i.e. between local branches.

Any help gratefully received.

AnswerRe: Mercurial: Pushing and Pulling Between Local Branches Pin
Albert Holguin21-Aug-12 7:35
memberAlbert Holguin21-Aug-12 7:35 
QuestionCodename Needed Pin
iPick1223-May-12 19:59
memberiPick1223-May-12 19:59 
AnswerRe: Codename Needed Pin
Richard MacCutchan23-May-12 22:19
mvpRichard MacCutchan23-May-12 22:19 
GeneralFurther definition Pin
iPick1224-May-12 2:57
memberiPick1224-May-12 2:57 
GeneralRe: Further definition Pin
Richard MacCutchan24-May-12 3:05
mvpRichard MacCutchan24-May-12 3:05 
GeneralRe: Further definition Pin
iPick1224-May-12 3:34
memberiPick1224-May-12 3:34 
AnswerRe: Codename Needed Pin
mark merrens4-Jul-12 9:57
membermark merrens4-Jul-12 9:57 
AnswerRe: Codename Needed Pin
Eddy Vluggen11-Aug-12 4:45
memberEddy Vluggen11-Aug-12 4:45 
AnswerRe: Codename Needed Pin
S. Becker4-Oct-12 1:52
memberS. Becker4-Oct-12 1:52 
QuestionFont licensing confusion Pin
cjhazard25-Feb-12 8:43
membercjhazard25-Feb-12 8:43 
AnswerRe: Font licensing confusion Pin
Shameel27-Feb-12 3:39
memberShameel27-Feb-12 3:39 
GeneralRe: Font licensing confusion Pin
cjhazard27-Feb-12 22:01
membercjhazard27-Feb-12 22:01 
Questiontragamonedas Pin
tonyzeta2013-Jan-12 3:36
membertonyzeta2013-Jan-12 3:36 
AnswerRe: tragamonedas Pin
jung-kreidler7-Feb-12 22:39
memberjung-kreidler7-Feb-12 22:39 
QuestionAutomatic deployment Pin
Super Lloyd28-Nov-11 14:52
memberSuper Lloyd28-Nov-11 14:52 
AnswerRe: Automatic deployment Pin
JC1727619-Dec-11 6:31
memberJC1727619-Dec-11 6:31 
GeneralRe: Automatic deployment Pin
Westpalm Roofing17-Jan-12 21:57
memberWestpalm Roofing17-Jan-12 21:57 

General General    News News    Suggestion Suggestion    Question Question    Bug Bug    Answer Answer    Joke Joke    Rant Rant    Admin Admin   

Use Ctrl+Left/Right to switch messages, Ctrl+Up/Down to switch threads, Ctrl+Shift+Left/Right to switch pages.

Advertise | Privacy | Mobile
Web03 | 2.8.1509028.1 | Last Updated 3 Oct 2015
Copyright © CodeProject, 1999-2015
All Rights Reserved. Terms of Service
Layout: fixed | fluid