howto suspend work

[Neal Becker]

Arne Babenhauserheide wrote:

> On Wednesday, 3. June 2009 15:38:18 Neal Becker wrote:
>> I could hg ci the new changes, and then hg update -r revA.  That's fine,
>> except the head would still be the aborted experiment.
> 
> If you want to keep it in history as failed attempt, just commit and then
> backout.
> 
> $ hg commit -m "Attempt to solve X"
> $ hg backout tip
> 
> If you want to only keep a backup which doesn't appear in history, just
> commit, clone the repo away and then rollback and "update -C".
> 
> $ hg commit -m "Failed attempt to solve X"
> $ cd ..
> $ hg clone project failed-attempt-to-solve-x
> $ cd project
> $ hg rollback # undo the commit
> $ hg update -C # update all files to the last committed version.
> 
> Backout has the advantage, that you can also backout of many changes,
> while rollback only undoes the last one ("clone -r GOOD_REV" can fill the
> role, though).
> 
> Best wishes,
> Arne
Backout sounds like the way to go.  But here's what I got:

 hg heads
changeset:   852:df64ff9fff80
tag:         tip
user:        ndbecker2 at gmail.com
date:        Wed Jun 03 14:36:16 2009 -0400
summary:     uw_pilots_storage test passed

changeset:   849:fd30ccb68b27
tag:         decimate_before
user:        ndbecker2 at gmail.com
date:        Wed Jun 03 09:42:32 2009 -0400
summary:     move decimation in front of uw pilots storage

 hg backout 849
abort: cannot back out change on a different branch

[nbecker at nbecker6 sim]$ hg glog --limit 10
@  changeset:   852:df64ff9fff80
|  tag:         tip
|  user:        ndbecker2 at gmail.com
|  date:        Wed Jun 03 14:36:16 2009 -0400
|  summary:     uw_pilots_storage test passed
|
o  changeset:   851:0c658ed246d9
|  user:        ndbecker2 at gmail.com
|  date:        Wed Jun 03 13:28:43 2009 -0400
|  summary:     uw_pilots_storage.v: change to output 2 samples per clock
|
o  changeset:   850:15a624a9eff5
|  parent:      848:eb081082a9d7
|  user:        ndbecker2 at gmail.com
|  date:        Wed Jun 03 13:13:41 2009 -0400
|  summary:     mmse_filter: change to compute sample every 8 clocks
|
| o  changeset:   849:fd30ccb68b27
|/   tag:         decimate_before
|    user:        ndbecker2 at gmail.com
|    date:        Wed Jun 03 09:42:32 2009 -0400
|    summary:     move decimation in front of uw pilots storage
|
o  changeset:   848:eb081082a9d7
|  user:        ndbecker2 at gmail.com
|  date:        Tue Jun 02 07:38:03 2009 -0400
|  summary:     Pipelining of carrier_est_1
|