[Chicago] Need Mercurial help

[Fawad Halim]

Hi,
  AFAIK, you can't remove heads from the repo. You'd have to either merge
them or create another repo that only has branches you're interested in.
Doing
hg clone -r 120 wc1 wc2

will give you a repo that only has the r120 head. You can add other branches
into it later.

I'm not sure can unmerge r82 without rolling back the local changes.

Regards
-fawad

On Mon, Jan 18, 2010 at 7:24 AM, <skip at pobox.com> wrote:

>
> I attempted to use Mercurial to manage the version control of the lockfile
> package (http://pypi.python.org/pypi/lockfile), but I seem to have gotten
> my
> repository all screwed up.  I think I'm going to go back to Subversion or
> CVS, anything would be simpler than the mess I have now.
>
> Is there some Mercurial expertise here I can lean on to try and get things
> straightened out?
>
> 1. My repository has a bunch of different heads:
>
>    % hg heads
>    changeset:   120:9cc71194b52a
>    branch:      python-package
>    tag:         tip
>    parent:      82:20939e395812
>    user:        Ben Finney <ben at benfinney.id.au>
>    date:        Fri Jan 15 21:51:09 2010 +1100
>    summary:     Merge from lockfile.python-package/.
>
>    changeset:   119:7f1c13ffa03f
>    user:        Ben Finney <ben at benfinney.id.au>
>    date:        Fri Jan 15 21:46:06 2010 +1100
>    summary:     Increment to version 0.9 and make a release entry.
>
>    changeset:   109:fc18c8d7aea1
>    branch:      pidlockfile
>    user:        Ben Finney <ben at benfinney.id.au>
>    date:        Sat Sep 26 20:34:27 2009 +1000
>    summary:     Implement ?TimeoutPIDLockFile? for advance specification of
> lock acquire timeout.
>
>    changeset:   99:cf798a2c6a22
>    branch:      timeout-raises-already-locked
>    user:        Ben Finney <ben+python at benfinney.id.au<ben%2Bpython at benfinney.id.au>
> >
>    date:        Sat Jul 04 23:43:30 2009 +1000
>    summary:     Fix trailing whitespace.
>
>    changeset:   92:5719e4379589
>    branch:      generalise-path
>    user:        Ben Finney <ben+python at benfinney.id.au<ben%2Bpython at benfinney.id.au>
> >
>    date:        Tue Apr 21 21:57:59 2009 +1000
>    summary:     Refactor more fixtures to scenarios.
>
> How can I whittle them down?
>
> 2. I have multiple parents:
>
>    % hg parents
>    changeset:   82:20939e395812
>    user:        Skip Montanaro <skip at pobox.com>
>    date:        Sun Apr 05 14:43:05 2009 -0500
>    summary:     a couple more python 2/3 diffs
>
>    changeset:   109:fc18c8d7aea1
>    branch:      pidlockfile
>    user:        Ben Finney <ben at benfinney.id.au>
>    date:        Sat Sep 26 20:34:27 2009 +1000
>    summary:     Implement ?TimeoutPIDLockFile? for advance specification of
> lock acquire timeout.
>
> and local mods:
>
>    % hg status
>    M MANIFEST
>    M PKG-INFO
>    M README
>    M RELEASE-NOTES
>    M doc/lockfile.rst
>    M lockfile.py
>    M pidlockfile.py
>    M setup.py
>    M test/__init__.py
>    M test/scaffold.py
>    M test/test_pidlockfile.py
>    A test/test_lockfile.py
>    R test_lockfile.py
>
> How can I get rid of changeset 109 as a parent and just be left with
> changeset 82 as a parent while not losing any current local modifications?
>
> Thx,
>
> Skip
> _______________________________________________
> Chicago mailing list
> Chicago at python.org
> http://mail.python.org/mailman/listinfo/chicago
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/chicago/attachments/20100118/a5fb781e/attachment.htm>