EPICS Home

Experimental Physics and Industrial Control System


 
2002  2003  2004  2005  2006  2007  2008  2009  <20102011  2012  2013  2014  2015  2016  2017  2018  2019  2020  2021  2022  2023  2024  Index 2002  2003  2004  2005  2006  2007  2008  2009  <20102011  2012  2013  2014  2015  2016  2017  2018  2019  2020  2021  2022  2023  2024 
<== Date ==> <== Thread ==>

Subject: Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base
From: Andrew Johnson <[email protected]>
To: [email protected]
Cc: Ben Franksen <[email protected]>
Date: Fri, 14 May 2010 13:28:29 -0500
On Friday 14 May 2010 12:54:10 Ben Franksen wrote:
>
> I am astonished. Does Bazaar not have an equivalent of 'darcs unrecord'?

It does, 'bzr uncommit' will remove the last committed revision, although it's 
not recommended to use it on a public repository where other people may have 
grabbed a copy of that revision.  I this case though I believe Jeff was 
talking about commits he made using CVS to the main trunk, before we switched 
to Bazaar.

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.

- Andrew
-- 
The best FOSS code is written to be read by other humans -- Harald Welte


Replies:
Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Ralph Lange
Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Ben Franksen
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 Ben Franksen

Navigate by Date:
Prev: Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Ben Franksen
Next: Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Ralph Lange
Index: 2002  2003  2004  2005  2006  2007  2008  2009  <20102011  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 Ben Franksen
Next: Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Ralph Lange
Index: 2002  2003  2004  2005  2006  2007  2008  2009  <20102011  2012  2013  2014  2015  2016  2017  2018  2019  2020  2021  2022  2023  2024