Subject: |
Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base |
From: |
Andrew Johnson <[email protected]> |
To: |
[email protected] |
Date: |
Fri, 14 May 2010 14:01:41 -0500 |
On Friday 14 May 2010 13:33:45 Ralph Lange wrote:
> On Fri 14 May 2010 14:28:29 Andrew Johnson wrote:
> > With Bazaar he could also use 'bzr merge --uncommitted' to pull copies of
> > any *uncommitted* changes from his work branch to the home machine
> > (assuming he has ssh or sftp access to work from home), thus avoiding the
> > need to commit a dummy revision.
>
> Wow, that's a neat feature. Didn't know that one.
It's *really useful if you've created a bug fix on a development branch which
already has committed changes (that are not ready to merge yet) but you want
to try out or commit the fix on the official branch or on some other branch.
'bzr shelve' is also very useful for managing uncommitted changes within a
single branch, especially if you want to merge the latest official patches
into a branch without committing your current changes.
- Andrew
--
The best FOSS code is written to be read by other humans -- Harald Welte
- References:
- Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Jeff Hill
- Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Andrew Johnson
- Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Ralph Lange
- Navigate by Date:
- Prev:
Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Ralph Lange
- Next:
Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Benjamin Franksen
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
<2010>
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Ralph Lange
- Next:
Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Ben Franksen
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
<2010>
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
|