[Scons-dev] Mercurial and the current SCons workflow are incompatible?

[Martin Geisler]

Gary Oberbrunner <garyo at oberbrunner.com> writes:


> I think I know how to do option 3 now (move tip to old good commit, close

> branch on bad commit, and keep going from old good commit).  I followed

> Martin's example.  Check out my test repo at

> https://bitbucket.org/garyo/scons/changesets where I did option 3.

>

> Here's what I did:

>   432  hg up -r f461304 * (this is the last good commit on default before

> the merge)*

>   433  vi src/CHANGES.txt

>   434  hg commit -m'Innocuous change to create new tip rev on default

> branch.'

>   435  hg up -r 8764000* (this is the current head)*

>   436  hg heads

>   437  hg commit --close-branch -m'Closed (premature merge); please

> continue from 4c89eb9bb854.'

>   438  hg push https://garyo@bitbucket.org/garyo/scons


Yes, those are the commands I used, sorry that I didn't include them in
my first mail!

If possible, I would include a real change instead of the innocuous
change, but that's just because I'm pedantic about having a clean
history :)

Btw, you can close 8764000 before updating back and forth -- all
changesets remain available even though you've closed the branch. Also,
despite the --close-branch option name, you're not really closing a
branch. Instead, you're closing a head which means that it wont be shown
in 'hg heads'. When all heads (not tips) on a given branch are closed,
then the branch as such is considered to be closed and will be hidden
From 'hg branches'. This also explains how to reopen a branch: any new
commit on the branch will create an open head, and thus bring the back
to life.

-- 
Martin Geisler
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
Url : <http://two.pairlist.net/pipermail/scons-dev/attachments/20121018/d0b01fe2/attachment.pgp>