| Submitter | timeless |
|---|---|
| Date | April 15, 2016, 5:41 p.m. |
| Message ID | <9c234779ab7a346379f1.1460742077@gcc2-power8.osuosl.org> |
| Download | mbox | patch |
| Permalink | /patch/14649/ |
| State | Accepted |
| Headers | show |
Comments
On 04/15/2016 10:41 AM, timeless wrote: > # HG changeset patch > # User timeless@gmail.com > # Date 1347636748 14400 > # Fri Sep 14 11:32:28 2012 -0400 > # Node ID 9c234779ab7a346379f19ea0b2e1d03355f1443c > # Parent 30fa0c553695102b55ef23419467e7a3d4812bec > # Available At https://bitbucket.org/timeless/mutable-history/ > # hg pull https://bitbucket.org/timeless/mutable-history/ -r 9c234779ab7a > Combined editorial fixes [Request for pull of 8fb554aa4533] > > This is a rollup of the following commits. > I'm having a hard time seeing the value in flooding the list with ~27 Do you have the expanded version somewhere? I would happily pull the 27. > emails. > > * Spelling (en-us): -ize > * Spelling: accessing > * Spelling: deserialize > * Spelling: directly > * Spelling: extinct > * Spelling: formerly > * Spelling: happened > * Spelling: directory > * Spelling: practice > * Spelling: precursors > * Spelling: remains > * Spelling: remotely > * Spelling: succeeded > * Spelling: those > * Spelling: through > * Spelling: unnecessary > * Spelling: versioning > * Grammar: has > * Grammar: introduced > * Grammar: resulting issues > * Grammar: the > * Grammar: paragraphs should end with periods > * Brand: Monty > * Brand: Mercurial > * Consistency: sucs > * Spelling: forbidden > * Spelling (en-us): behavior > * Spelling: committed > > https://bitbucket.org/timeless/mutable-history/commits/all?search=f7c9841c03d8%3A%3A8fb554aa4533 > > diff -r 30fa0c553695 -r 9c234779ab7a README > --- a/README Thu Apr 14 17:42:18 2016 +0000 > +++ b/README Fri Sep 14 11:32:28 2012 -0400 > @@ -103,7 +103,7 @@ > in now in `--all --any`. > - evolve: add a 'experimental.evolutioncommands' for fine grained commands > enabling > -- next/prev: requires `--merge` to move with uncommited changes > +- next/prev: requires `--merge` to move with uncommitted changes > - next: significantly reword error messages > - next: add a --evolve flag to evolve aspiring children when on a head > > diff -r 30fa0c553695 -r 9c234779ab7a contrib/nopushpublish.py > --- a/contrib/nopushpublish.py Thu Apr 14 17:42:18 2016 +0000 > +++ b/contrib/nopushpublish.py Fri Sep 14 11:32:28 2012 -0400 > @@ -27,7 +27,7 @@ > > ret = orig(repo, remote, outgoing, *args) > if npublish: > - raise util.Abort("Publishing push forbiden", > + raise util.Abort("Publishing push forbidden", > hint="Use `hg phase -p <rev>` to manually publish them") > > return ret > diff -r 30fa0c553695 -r 9c234779ab7a docs/evolve-faq.rst > --- a/docs/evolve-faq.rst Thu Apr 14 17:42:18 2016 +0000 > +++ b/docs/evolve-faq.rst Fri Sep 14 11:32:28 2012 -0400 > @@ -110,7 +110,7 @@ > $ hg record > # commit the second part > $ hg commit > - # informs mercurial of what appened > + # informs mercurial of what happened > # current changeset (.) and previous one (.^) replace A (42) > $ hg prune --new . --new .^ 42 > > diff -r 30fa0c553695 -r 9c234779ab7a docs/evolve-good-practice.rst > --- a/docs/evolve-good-practice.rst Thu Apr 14 17:42:18 2016 +0000 > +++ b/docs/evolve-good-practice.rst Fri Sep 14 11:32:28 2012 -0400 > @@ -27,7 +27,7 @@ > There is no descent conflict detection and handling right now. > Rewriting other people's changesets guarantees that you will get > conflicts. Communicate with your fellow developers before trying to > -touch other people's work (which is a good pratice in any case). > +touch other people's work (which is a good practice in any case). > > Using multiple branches will help you to achieve this goal. > > diff -r 30fa0c553695 -r 9c234779ab7a docs/from-mq.rst > --- a/docs/from-mq.rst Thu Apr 14 17:42:18 2016 +0000 > +++ b/docs/from-mq.rst Fri Sep 14 11:32:28 2012 -0400 > @@ -85,7 +85,7 @@ > .. $ hg record -m 'feature A' > .. # oups, I forgot some stuff > .. $ hg record babar.py > -.. $ hg amend -c .^ # .^ refer to "working directoy parent, here 'feature A' > +.. $ hg amend -c .^ # .^ refer to "working directory parent, here 'feature A' > > .. note: refresh is an alias for amend > > diff -r 30fa0c553695 -r 9c234779ab7a docs/obs-terms.rst > --- a/docs/obs-terms.rst Thu Apr 14 17:42:18 2016 +0000 > +++ b/docs/obs-terms.rst Fri Sep 14 11:32:28 2012 -0400 > @@ -20,7 +20,7 @@ > - multiple *successors*: the *precursor* were splits in multiple > changesets. > > -.. The *precursors* and *successors* terms can be used on changeset directy: > +.. The *precursors* and *successors* terms can be used on changeset directly: > > .. :precursors: of a changeset `A` are changesets used as *precursors* by > .. obsolete marker using changeset `A` as *successors* > @@ -84,8 +84,8 @@ > | | | *obsolete* with at least | > | | | one non-obsolete descendant | > | | | | > -| | | Thoses descendants prevent | > -| | | properties of extincts | > +| | | Those descendants prevent | > +| | | properties of extinct | > | | | changesets to apply. But | > | | | they will refuse to be | > | | | pushed without --force. | > @@ -169,7 +169,7 @@ > | Rewriting operation refuse to work on immutable changeset. | > | | > | Obsolete markers that refer an immutable changeset as precursors have | > -| no effect on the precussors but may have effect on the successors. | > +| no effect on the precursors but may have effect on the successors. | > | | > | When a *mutable* changeset becomes *immutable* (changing its phase from draft| > | to public) it is just *immutable* and loose any property of it's former | > diff -r 30fa0c553695 -r 9c234779ab7a hgext/evolve.py > --- a/hgext/evolve.py Thu Apr 14 17:42:18 2016 +0000 > +++ b/hgext/evolve.py Fri Sep 14 11:32:28 2012 -0400 > @@ -9,11 +9,11 @@ > '''extends Mercurial feature related to Changeset Evolution > > This extension provides several commands to mutate history and deal with > -issues it may raise. > +resulting issues. > > It also: > > - - enables the "Changeset Obsolescence" feature of mercurial, > + - enables the "Changeset Obsolescence" feature of Mercurial, > - alters core commands and extensions that rewrite history to use > this feature, > - improves some aspect of the early implementation in Mercurial core > @@ -230,7 +230,7 @@ > c(ui) > > def final_reposetup(self, ui, repo): > - """Method to be used as a the extension reposetup > + """Method to be used as the extension reposetup > > The following operations belong here: > > @@ -323,7 +323,7 @@ > will be applied in the extension commandtable. This argument must be a > string that will be searched using `extension.find` if not found and > Abort error is raised. If the wrapping applies to an extension, it is > - installed during `extsetup` > + installed during `extsetup`. > > example:: > > @@ -458,7 +458,7 @@ > # - Function to create markers > # - useful alias pstatus and pdiff (should probably go in evolve) > # - "troubles" method on changectx > -# - function to travel throught the obsolescence graph > +# - function to travel through the obsolescence graph > # - function to find useful changeset to stabilize > > > @@ -835,7 +835,7 @@ > wlock = repo.wlock() > lock = repo.lock() > tr = repo.transaction('rewrite') > - if len(old.parents()) > 1: #XXX remove this unecessary limitation. > + if len(old.parents()) > 1: #XXX remove this unnecessary limitation. > raise error.Abort(_('cannot amend merge changesets')) > base = old.p1() > updatebookmarks = _bookmarksupdater(repo, old.node(), tr) > @@ -2837,7 +2837,7 @@ > if obsoleted: > obsoleted = repo.set('%lr', obsoleted) > result = orig(ui, repo, *arg, **kwargs) > - if not result: # commit successed > + if not result: # commit succeeded > new = repo['-1'] > oldbookmarks = [] > markers = [] > diff -r 30fa0c553695 -r 9c234779ab7a hgext/obsolete.py > --- a/hgext/obsolete.py Thu Apr 14 17:42:18 2016 +0000 > +++ b/hgext/obsolete.py Fri Sep 14 11:32:28 2012 -0400 > @@ -3,12 +3,12 @@ > # > # This software may be used and distributed according to the terms of the > # GNU General Public License version 2 or any later version. > -"""Deprecated extension that formely introduces "Changeset Obsolescence". > +"""Deprecated extension that formerly introduced "Changeset Obsolescence". > > -This concept is now partially in Mercurial core (starting with mercurial 2.3). > -The remaining logic have been grouped with the evolve extension. > +This concept is now partially in Mercurial core (starting with Mercurial 2.3). > +The remaining logic has been grouped with the evolve extension. > > -Some code cemains in this extensions to detect and convert prehistoric format > +Some code remains in this extensions to detect and convert prehistoric format > of obsolete marker than early user may have create. Keep it enabled if you > were such user. > """ > @@ -57,10 +57,10 @@ > raise error.Abort('old format of obsolete marker detected!\n' > 'run `hg debugconvertobsolete` once.') > > -def _obsdeserialise(flike): > - """read a file like object serialised with _obsserialise > +def _obsdeserialize(flike): > + """read a file like object serialized with _obsserialize > > - this desierialize into a {subject -> objects} mapping > + this deserialize into a {subject -> objects} mapping > > this was the very first format ever.""" > rels = {} > @@ -138,9 +138,9 @@ > meta = dict((k.encode('utf-8'), v.encode('utf-8')) > for k, v in oldmark.iteritems()) > try: > - succs = [bin(n) for n in oldsubjects] > - succs = [n for n in succs if n != nullid] > - store.create(tr, bin(oldobject), succs, > + sucs = [bin(n) for n in oldsubjects] > + sucs = [n for n in sucs if n != nullid] > + store.create(tr, bin(oldobject), sucs, > 0, metadata=meta) > cnt += 1 > except ValueError: > diff -r 30fa0c553695 -r 9c234779ab7a tests/test-split.t > --- a/tests/test-split.t Thu Apr 14 17:42:18 2016 +0000 > +++ b/tests/test-split.t Fri Sep 14 11:32:28 2012 -0400 > @@ -123,7 +123,7 @@ > summary: add _a > > > -Cannot split a commit with uncommited changes > +Cannot split a commit with uncommitted changes > $ hg up "desc(_c)" > 1 files updated, 0 files merged, 1 files removed, 0 files unresolved > $ echo "_cd" > _c > diff -r 30fa0c553695 -r 9c234779ab7a tests/test-stabilize-order.t > --- a/tests/test-stabilize-order.t Thu Apr 14 17:42:18 2016 +0000 > +++ b/tests/test-stabilize-order.t Fri Sep 14 11:32:28 2012 -0400 > @@ -132,7 +132,7 @@ > no troubled changesets > [1] > > -Test behaviour with --any > +Test behavior with --any > > $ hg up 8 > 0 files updated, 0 files merged, 1 files removed, 0 files unresolved > diff -r 30fa0c553695 -r 9c234779ab7a tests/test-tutorial.t > --- a/tests/test-tutorial.t Thu Apr 14 17:42:18 2016 +0000 > +++ b/tests/test-tutorial.t Fri Sep 14 11:32:28 2012 -0400 > @@ -74,7 +74,7 @@ > Fixing mistake with `hg amend` > -------------------------------- > > -We are versionning a shopping list > +We are versioning a shopping list > > $ cd local > $ cat >> shopping << EOF > @@ -86,7 +86,7 @@ > > Blancmange > > Salmon mousse > > EOF > - $ hg commit -A -m "Monthy Python Shopping list" > + $ hg commit -A -m "Monty Python Shopping list" > adding shopping > > Its first version is shared with the outside. > @@ -118,11 +118,11 @@ > This history is very linear > > $ hg log -G > - @ d85de4546133 (draft): adding fruit > + @ aae8257dd79c (draft): adding fruit > | > - o 4d5dc8187023 (draft): adding condiment > + o fd8bfdcd5133 (draft): adding condiment > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > But a typo was made in Babanas! > @@ -132,8 +132,8 @@ > # User test > # Date 0 0 > # Thu Jan 01 00:00:00 1970 +0000 > - # Node ID d85de4546133030c82d257bbcdd9b1b416d0c31c > - # Parent 4d5dc81870237d492284826e21840b2ca00e26d1 > + # Node ID aae8257dd79ce1c8de4e2b3caefc6cd782ae9796 > + # Parent fd8bfdcd5133c73c46b165ec276c5695fccf5c4b > adding fruit > > diff --git a/shopping b/shopping > @@ -151,11 +151,11 @@ > the outside. The first one has been exchanged and is "public" (immutable). > > $ hg log -G > - @ d85de4546133 (draft): adding fruit > + @ aae8257dd79c (draft): adding fruit > | > - o 4d5dc8187023 (draft): adding condiment > + o fd8bfdcd5133 (draft): adding condiment > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > hopefully. I can use `hg commit --amend` to rewrite my faulty changeset! > @@ -178,19 +178,19 @@ > A new changeset with the right diff replace the wrong one. > > $ hg log -G > - @ 9d0363b81950 (draft): adding fruit > + @ a114c282451d (draft): adding fruit > | > - o 4d5dc8187023 (draft): adding condiment > + o fd8bfdcd5133 (draft): adding condiment > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > $ hg export tip > # HG changeset patch > # User test > # Date 0 0 > # Thu Jan 01 00:00:00 1970 +0000 > - # Node ID 9d0363b81950646bc6ad1ec5de8b8197ea586541 > - # Parent 4d5dc81870237d492284826e21840b2ca00e26d1 > + # Node ID a114c282451d30a10a190d40dac49e12a654ff10 > + # Parent fd8bfdcd5133c73c46b165ec276c5695fccf5c4b > adding fruit > > diff --git a/shopping b/shopping > @@ -207,7 +207,7 @@ > Getting rid of branchy history > ---------------------------------- > > -While I was working on my list. someone made a change remotly. > +While I was working on my list. someone made a change remotely. > > $ cd ../remote > $ hg up -q > @@ -229,35 +229,35 @@ > I now have a new heads. Note that this remote head is immutable > > $ hg log -G > - o 9ca060c80d74 (public): SPAM > + o dfb2eedad5f4 (public): SPAM > | > - | @ 9d0363b81950 (draft): adding fruit > + | @ a114c282451d (draft): adding fruit > | | > - | o 4d5dc8187023 (draft): adding condiment > + | o fd8bfdcd5133 (draft): adding condiment > |/ > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > instead of merging my head with the new one. I'm going to rebase my work > > $ hg diff > - $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023 > - rebasing 1:4d5dc8187023 "adding condiment" > + $ hg rebase --dest dfb2eedad5f4 --source fd8bfdcd5133 > + rebasing 1:fd8bfdcd5133 "adding condiment" > merging shopping > - rebasing 4:9d0363b81950 "adding fruit" > + rebasing 4:a114c282451d "adding fruit" > merging shopping > > > My local work is now rebased on the remote one. > > $ hg log -G > - @ 41aff6a42b75 (draft): adding fruit > + @ 3997e380aadb (draft): adding fruit > | > - o dfd3a2d7691e (draft): adding condiment > + o dd8b32153d42 (draft): adding condiment > | > - o 9ca060c80d74 (public): SPAM > + o dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > Removing changesets > @@ -273,15 +273,15 @@ > > EOF > $ hg ci -m 'transport' > $ hg log -G > - @ 1125e39fbf21 (draft): transport > + @ 12d7a1c26dd2 (draft): transport > | > - o 41aff6a42b75 (draft): adding fruit > + o 3997e380aadb (draft): adding fruit > | > - o dfd3a2d7691e (draft): adding condiment > + o dd8b32153d42 (draft): adding condiment > | > - o 9ca060c80d74 (public): SPAM > + o dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > I have a new commit but I realize that don't want it. (transport shop list does > @@ -289,19 +289,19 @@ > > $ hg prune . # "." is for working directory parent > 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > - working directory now at 41aff6a42b75 > + working directory now at 3997e380aadb > 1 changesets pruned > > The silly changeset is gone. > > $ hg log -G > - @ 41aff6a42b75 (draft): adding fruit > + @ 3997e380aadb (draft): adding fruit > | > - o dfd3a2d7691e (draft): adding condiment > + o dd8b32153d42 (draft): adding condiment > | > - o 9ca060c80d74 (public): SPAM > + o dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > Reordering changesets > @@ -323,20 +323,20 @@ > $ sed -i'' -e 's/Spam/Spam Spam Spam/g' shopping > $ hg ci -m 'SPAM SPAM' > $ hg log -G > - @ fac207dec9f5 (draft): SPAM SPAM > + @ 2262f535e11b (draft): SPAM SPAM > | > - o 10b8aeaa8cc8 (draft): bathroom stuff > + o 9c5c4ca7aaf2 (draft): bathroom stuff > | > - o 41aff6a42b75 (draft): adding fruit > + o 3997e380aadb (draft): adding fruit > | > - o dfd3a2d7691e (draft): adding condiment > + o dd8b32153d42 (draft): adding condiment > | > - o 9ca060c80d74 (public): SPAM > + o dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > -.. note:: We can't amend changeset 7e82d3f3c2cb or 9ca060c80d74 as they are immutable. > +.. note:: We can't amend changeset 01b60331571c or dfb2eedad5f4 as they are immutable. > > I now want to push to remote all my changes except the bathroom one, which I'm > not totally happy with yet. To be able to push "SPAM SPAM" I need a version of > @@ -346,24 +346,24 @@ > > .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>` > > - $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent > + $ hg up 'p1(9c5c4ca7aaf2)' # going on "bathroom stuff" parent > 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > - $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent > - rebasing 10:fac207dec9f5 "SPAM SPAM" (tip) > + $ hg grab 2262f535e11b # moving "SPAM SPAM" to the working directory parent > + rebasing 10:2262f535e11b "SPAM SPAM" (tip) > merging shopping > - ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) > + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg log -G > - @ a224f2a4fb9f (draft): SPAM SPAM > + @ b0023982be53 (draft): SPAM SPAM > | > - | o 10b8aeaa8cc8 (draft): bathroom stuff > + | o 9c5c4ca7aaf2 (draft): bathroom stuff > |/ > - o 41aff6a42b75 (draft): adding fruit > + o 3997e380aadb (draft): adding fruit > | > - o dfd3a2d7691e (draft): adding condiment > + o dd8b32153d42 (draft): adding condiment > | > - o 9ca060c80d74 (public): SPAM > + o dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > We have a new SPAM SPAM version without the bathroom stuff > @@ -377,8 +377,8 @@ > # User test > # Date 0 0 > # Thu Jan 01 00:00:00 1970 +0000 > - # Node ID a224f2a4fb9f9f828f608959912229d7b38b26de > - # Parent 41aff6a42b7578ec7ec3cb2041633f1ca43cca96 > + # Node ID b0023982be539d96df8fafa5257eab26e09192c8 > + # Parent 3997e380aadbbbf75961f17fc5c68cc131cc8405 > SPAM SPAM > > diff --git a/shopping b/shopping > @@ -394,7 +394,7 @@ > To make sure I do not push unready changeset by mistake I set the "bathroom > stuff" changeset in the secret phase. > > - $ hg phase --force --secret 10b8aeaa8cc8 > + $ hg phase --force --secret 9c5c4ca7aaf2 > > we can now push our change: > > @@ -409,23 +409,23 @@ > > for simplicity sake we get the bathroom change in line again > > - $ hg grab 10b8aeaa8cc8 > - rebasing 9:10b8aeaa8cc8 "bathroom stuff" > + $ hg grab 9c5c4ca7aaf2 > + rebasing 9:9c5c4ca7aaf2 "bathroom stuff" > merging shopping > - ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) > + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg phase --draft . > $ hg log -G > - @ 75954b8cd933 (draft): bathroom stuff > + @ 54c3c44b4486 (draft): bathroom stuff > | > - o a224f2a4fb9f (public): SPAM SPAM > + o b0023982be53 (public): SPAM SPAM > | > - o 41aff6a42b75 (public): adding fruit > + o 3997e380aadb (public): adding fruit > | > - o dfd3a2d7691e (public): adding condiment > + o dd8b32153d42 (public): adding condiment > | > - o 9ca060c80d74 (public): SPAM > + o dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > > @@ -528,17 +528,17 @@ > 1 new obsolescence markers > (run 'hg update' to get a working copy) > $ hg log -G > - o 75954b8cd933 (public): bathroom stuff > + o 54c3c44b4486 (public): bathroom stuff > | > - o a224f2a4fb9f (public): SPAM SPAM > + o b0023982be53 (public): SPAM SPAM > | > - o 41aff6a42b75 (public): adding fruit > + o 3997e380aadb (public): adding fruit > | > - o dfd3a2d7691e (public): adding condiment > + o dd8b32153d42 (public): adding condiment > | > - @ 9ca060c80d74 (public): SPAM > + @ dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > > @@ -550,15 +550,15 @@ > $ hg rollback > repository tip rolled back to revision 4 (undo pull) > $ hg log -G > - o a224f2a4fb9f (public): SPAM SPAM > + o b0023982be53 (public): SPAM SPAM > | > - o 41aff6a42b75 (public): adding fruit > + o 3997e380aadb (public): adding fruit > | > - o dfd3a2d7691e (public): adding condiment > + o dd8b32153d42 (public): adding condiment > | > - @ 9ca060c80d74 (public): SPAM > + @ dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > Let's make the local repo "non publishing" > @@ -585,17 +585,17 @@ > 1 new obsolescence markers > (run 'hg update' to get a working copy) > $ hg log -G > - o 75954b8cd933 (draft): bathroom stuff > + o 54c3c44b4486 (draft): bathroom stuff > | > - o a224f2a4fb9f (public): SPAM SPAM > + o b0023982be53 (public): SPAM SPAM > | > - o 41aff6a42b75 (public): adding fruit > + o 3997e380aadb (public): adding fruit > | > - o dfd3a2d7691e (public): adding condiment > + o dd8b32153d42 (public): adding condiment > | > - @ 9ca060c80d74 (public): SPAM > + @ dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > Rebasing unstable change after pull > @@ -603,7 +603,7 @@ > > Remotely someone add a new changeset on top of the mutable "bathroom" on. > > - $ hg up 75954b8cd933 -q > + $ hg up 54c3c44b4486 -q > $ cat >> shopping << EOF > > Giraffe > > Rhino > @@ -615,21 +615,21 @@ > But at the same time, locally, this same "bathroom changeset" was updated. > > $ cd ../local > - $ hg up 75954b8cd933 -q > + $ hg up 54c3c44b4486 -q > $ sed -i'' -e 's/... More bathroom stuff to come/Bath Robe/' shopping > $ hg commit --amend > $ hg log -G > - @ a44c85f957d3 (draft): bathroom stuff > + @ d7146c8844e2 (draft): bathroom stuff > | > - o a224f2a4fb9f (public): SPAM SPAM > + o b0023982be53 (public): SPAM SPAM > | > - o 41aff6a42b75 (public): adding fruit > + o 3997e380aadb (public): adding fruit > | > - o dfd3a2d7691e (public): adding condiment > + o dd8b32153d42 (public): adding condiment > | > - o 9ca060c80d74 (public): SPAM > + o dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > > @@ -650,27 +650,27 @@ > see both version showing up in the log. > > $ hg log -G > - o bf1b0d202029 (draft): animals > + o aa715c4a19e6 (draft): animals > | > - | @ a44c85f957d3 (draft): bathroom stuff > + | @ d7146c8844e2 (draft): bathroom stuff > | | > - x | 75954b8cd933 (draft): bathroom stuff > + x | 54c3c44b4486 (draft): bathroom stuff > |/ > - o a224f2a4fb9f (public): SPAM SPAM > + o b0023982be53 (public): SPAM SPAM > | > - o 41aff6a42b75 (public): adding fruit > + o 3997e380aadb (public): adding fruit > | > - o dfd3a2d7691e (public): adding condiment > + o dd8b32153d42 (public): adding condiment > | > - o 9ca060c80d74 (public): SPAM > + o dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > -The older version 75954b8cd933 never ceased to exist in the local repo. It was > +The older version 54c3c44b4486 never ceased to exist in the local repo. It was > just hidden and excluded from pull and push. > > -.. note:: In hgview there is a nice dotted relation highlighting a44c85f957d3 as a new version of 75954b8cd933. this is not yet ported to ``hg log -G``. > +.. note:: In hgview there is a nice dotted relation highlighting a44c85f957d3 as a new version of 54c3c44b4486. this is not yet ported to ``hg log -G``. > > There is now an **unstable** changeset in this history. Mercurial will refuse to > share it with the outside: > @@ -678,7 +678,7 @@ > $ hg push other > pushing to $TESTTMP/other (glob) > searching for changes > - abort: push includes unstable changeset: bf1b0d202029! > + abort: push includes unstable changeset: aa715c4a19e6! > (use 'hg evolve' to get a stable history or --force to ignore warnings) > [255] > > @@ -693,7 +693,7 @@ > $ hg evolve --dry-run > move:[15] animals > atop:[14] bathroom stuff > - hg rebase -r bf1b0d202029 -d a44c85f957d3 > + hg rebase -r aa715c4a19e6 -d d7146c8844e2 > > Let's do it > > @@ -701,24 +701,24 @@ > move:[15] animals > atop:[14] bathroom stuff > merging shopping > - working directory is now at ee942144f952 > + working directory is now at 4783a0ff199d > > The old version of bathroom is hidden again. > > $ hg log -G > - @ ee942144f952 (draft): animals > + @ 4783a0ff199d (draft): animals > | > - o a44c85f957d3 (draft): bathroom stuff > + o d7146c8844e2 (draft): bathroom stuff > | > - o a224f2a4fb9f (public): SPAM SPAM > + o b0023982be53 (public): SPAM SPAM > | > - o 41aff6a42b75 (public): adding fruit > + o 3997e380aadb (public): adding fruit > | > - o dfd3a2d7691e (public): adding condiment > + o dd8b32153d42 (public): adding condiment > | > - o 9ca060c80d74 (public): SPAM > + o dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > > @@ -746,13 +746,13 @@ > now let's see where we are, and update to the successor > > $ hg parents > - bf1b0d202029 (draft): animals > + aa715c4a19e6 (draft): animals > working directory parent is obsolete! > (use "hg evolve" to update to its successor) > $ hg evolve > update:[8] animals > 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > - working directory is now at ee942144f952 > + working directory is now at 4783a0ff199d > > Relocating unstable change after prune > ---------------------------------------------- > @@ -774,28 +774,28 @@ > added 1 changesets with 1 changes to 1 files > (run 'hg update' to get a working copy) > $ hg log -G > - o 99f039c5ec9e (draft): SPAM SPAM SPAM > + o fc817bcb9392 (draft): SPAM SPAM SPAM > | > - @ ee942144f952 (draft): animals > + @ 4783a0ff199d (draft): animals > | > - o a44c85f957d3 (draft): bathroom stuff > + o d7146c8844e2 (draft): bathroom stuff > | > - o a224f2a4fb9f (public): SPAM SPAM > + o b0023982be53 (public): SPAM SPAM > | > - o 41aff6a42b75 (public): adding fruit > + o 3997e380aadb (public): adding fruit > | > - o dfd3a2d7691e (public): adding condiment > + o dd8b32153d42 (public): adding condiment > | > - o 9ca060c80d74 (public): SPAM > + o dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: > > - $ hg prune ee942144f952 > + $ hg prune 4783a0ff199d > 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > - working directory now at a44c85f957d3 > + working directory now at d7146c8844e2 > 1 changesets pruned > 1 new unstable changesets > > @@ -804,46 +804,46 @@ > is neither dead or obsolete. My repository is in an unstable state again. > > $ hg log -G > - o 99f039c5ec9e (draft): SPAM SPAM SPAM > + o fc817bcb9392 (draft): SPAM SPAM SPAM > | > - x ee942144f952 (draft): animals > + x 4783a0ff199d (draft): animals > | > - @ a44c85f957d3 (draft): bathroom stuff > + @ d7146c8844e2 (draft): bathroom stuff > | > - o a224f2a4fb9f (public): SPAM SPAM > + o b0023982be53 (public): SPAM SPAM > | > - o 41aff6a42b75 (public): adding fruit > + o 3997e380aadb (public): adding fruit > | > - o dfd3a2d7691e (public): adding condiment > + o dd8b32153d42 (public): adding condiment > | > - o 9ca060c80d74 (public): SPAM > + o dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > $ hg log -r 'unstable()' > - 99f039c5ec9e (draft): SPAM SPAM SPAM > + fc817bcb9392 (draft): SPAM SPAM SPAM > > $ hg evolve > move:[17] SPAM SPAM SPAM > atop:[14] bathroom stuff > merging shopping > - working directory is now at 40aa40daeefb > + working directory is now at 96226e87b42a > > $ hg log -G > - @ 40aa40daeefb (draft): SPAM SPAM SPAM > + @ 96226e87b42a (draft): SPAM SPAM SPAM > | > - o a44c85f957d3 (draft): bathroom stuff > + o d7146c8844e2 (draft): bathroom stuff > | > - o a224f2a4fb9f (public): SPAM SPAM > + o b0023982be53 (public): SPAM SPAM > | > - o 41aff6a42b75 (public): adding fruit > + o 3997e380aadb (public): adding fruit > | > - o dfd3a2d7691e (public): adding condiment > + o dd8b32153d42 (public): adding condiment > | > - o 9ca060c80d74 (public): SPAM > + o dfb2eedad5f4 (public): SPAM > | > - o 7e82d3f3c2cb (public): Monthy Python Shopping list > + o 01b60331571c (public): Monty Python Shopping list > > > > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
On Fri, Apr 15, 2016 at 2:11 PM, Pierre-Yves David <pierre-yves.david@ens-lyon.org> wrote: > > > On 04/15/2016 10:41 AM, timeless wrote: >> >> # HG changeset patch >> # User timeless@gmail.com >> # Date 1347636748 14400 >> # Fri Sep 14 11:32:28 2012 -0400 >> # Node ID 9c234779ab7a346379f19ea0b2e1d03355f1443c >> # Parent 30fa0c553695102b55ef23419467e7a3d4812bec >> # Available At https://bitbucket.org/timeless/mutable-history/ >> # hg pull https://bitbucket.org/timeless/mutable-history/ -r >> 9c234779ab7a >> Combined editorial fixes [Request for pull of 8fb554aa4533] >> >> This is a rollup of the following commits. >> I'm having a hard time seeing the value in flooding the list with ~27 > > > Do you have the expanded version somewhere? I would happily pull the 27. I burried the lead (it was the last line of the commit message): https://bitbucket.org/timeless/mutable-history/commits/all?search=f7c9841c03d8%3A%3A8fb554aa4533 here's the last commit for pulling purposes: https://bitbucket.org/timeless/mutable-history/commits/8fb554aa45335f8d54cca474fc9dd02a5a23e6a5
Patch
diff -r 30fa0c553695 -r 9c234779ab7a README --- a/README Thu Apr 14 17:42:18 2016 +0000 +++ b/README Fri Sep 14 11:32:28 2012 -0400 @@ -103,7 +103,7 @@ in now in `--all --any`. - evolve: add a 'experimental.evolutioncommands' for fine grained commands enabling -- next/prev: requires `--merge` to move with uncommited changes +- next/prev: requires `--merge` to move with uncommitted changes - next: significantly reword error messages - next: add a --evolve flag to evolve aspiring children when on a head diff -r 30fa0c553695 -r 9c234779ab7a contrib/nopushpublish.py --- a/contrib/nopushpublish.py Thu Apr 14 17:42:18 2016 +0000 +++ b/contrib/nopushpublish.py Fri Sep 14 11:32:28 2012 -0400 @@ -27,7 +27,7 @@ ret = orig(repo, remote, outgoing, *args) if npublish: - raise util.Abort("Publishing push forbiden", + raise util.Abort("Publishing push forbidden", hint="Use `hg phase -p <rev>` to manually publish them") return ret diff -r 30fa0c553695 -r 9c234779ab7a docs/evolve-faq.rst --- a/docs/evolve-faq.rst Thu Apr 14 17:42:18 2016 +0000 +++ b/docs/evolve-faq.rst Fri Sep 14 11:32:28 2012 -0400 @@ -110,7 +110,7 @@ $ hg record # commit the second part $ hg commit - # informs mercurial of what appened + # informs mercurial of what happened # current changeset (.) and previous one (.^) replace A (42) $ hg prune --new . --new .^ 42 diff -r 30fa0c553695 -r 9c234779ab7a docs/evolve-good-practice.rst --- a/docs/evolve-good-practice.rst Thu Apr 14 17:42:18 2016 +0000 +++ b/docs/evolve-good-practice.rst Fri Sep 14 11:32:28 2012 -0400 @@ -27,7 +27,7 @@ There is no descent conflict detection and handling right now. Rewriting other people's changesets guarantees that you will get conflicts. Communicate with your fellow developers before trying to -touch other people's work (which is a good pratice in any case). +touch other people's work (which is a good practice in any case). Using multiple branches will help you to achieve this goal. diff -r 30fa0c553695 -r 9c234779ab7a docs/from-mq.rst --- a/docs/from-mq.rst Thu Apr 14 17:42:18 2016 +0000 +++ b/docs/from-mq.rst Fri Sep 14 11:32:28 2012 -0400 @@ -85,7 +85,7 @@ .. $ hg record -m 'feature A' .. # oups, I forgot some stuff .. $ hg record babar.py -.. $ hg amend -c .^ # .^ refer to "working directoy parent, here 'feature A' +.. $ hg amend -c .^ # .^ refer to "working directory parent, here 'feature A' .. note: refresh is an alias for amend diff -r 30fa0c553695 -r 9c234779ab7a docs/obs-terms.rst --- a/docs/obs-terms.rst Thu Apr 14 17:42:18 2016 +0000 +++ b/docs/obs-terms.rst Fri Sep 14 11:32:28 2012 -0400 @@ -20,7 +20,7 @@ - multiple *successors*: the *precursor* were splits in multiple changesets. -.. The *precursors* and *successors* terms can be used on changeset directy: +.. The *precursors* and *successors* terms can be used on changeset directly: .. :precursors: of a changeset `A` are changesets used as *precursors* by .. obsolete marker using changeset `A` as *successors* @@ -84,8 +84,8 @@ | | | *obsolete* with at least | | | | one non-obsolete descendant | | | | | -| | | Thoses descendants prevent | -| | | properties of extincts | +| | | Those descendants prevent | +| | | properties of extinct | | | | changesets to apply. But | | | | they will refuse to be | | | | pushed without --force. | @@ -169,7 +169,7 @@ | Rewriting operation refuse to work on immutable changeset. | | | | Obsolete markers that refer an immutable changeset as precursors have | -| no effect on the precussors but may have effect on the successors. | +| no effect on the precursors but may have effect on the successors. | | | | When a *mutable* changeset becomes *immutable* (changing its phase from draft| | to public) it is just *immutable* and loose any property of it's former | diff -r 30fa0c553695 -r 9c234779ab7a hgext/evolve.py --- a/hgext/evolve.py Thu Apr 14 17:42:18 2016 +0000 +++ b/hgext/evolve.py Fri Sep 14 11:32:28 2012 -0400 @@ -9,11 +9,11 @@ '''extends Mercurial feature related to Changeset Evolution This extension provides several commands to mutate history and deal with -issues it may raise. +resulting issues. It also: - - enables the "Changeset Obsolescence" feature of mercurial, + - enables the "Changeset Obsolescence" feature of Mercurial, - alters core commands and extensions that rewrite history to use this feature, - improves some aspect of the early implementation in Mercurial core @@ -230,7 +230,7 @@ c(ui) def final_reposetup(self, ui, repo): - """Method to be used as a the extension reposetup + """Method to be used as the extension reposetup The following operations belong here: @@ -323,7 +323,7 @@ will be applied in the extension commandtable. This argument must be a string that will be searched using `extension.find` if not found and Abort error is raised. If the wrapping applies to an extension, it is - installed during `extsetup` + installed during `extsetup`. example:: @@ -458,7 +458,7 @@ # - Function to create markers # - useful alias pstatus and pdiff (should probably go in evolve) # - "troubles" method on changectx -# - function to travel throught the obsolescence graph +# - function to travel through the obsolescence graph # - function to find useful changeset to stabilize @@ -835,7 +835,7 @@ wlock = repo.wlock() lock = repo.lock() tr = repo.transaction('rewrite') - if len(old.parents()) > 1: #XXX remove this unecessary limitation. + if len(old.parents()) > 1: #XXX remove this unnecessary limitation. raise error.Abort(_('cannot amend merge changesets')) base = old.p1() updatebookmarks = _bookmarksupdater(repo, old.node(), tr) @@ -2837,7 +2837,7 @@ if obsoleted: obsoleted = repo.set('%lr', obsoleted) result = orig(ui, repo, *arg, **kwargs) - if not result: # commit successed + if not result: # commit succeeded new = repo['-1'] oldbookmarks = [] markers = [] diff -r 30fa0c553695 -r 9c234779ab7a hgext/obsolete.py --- a/hgext/obsolete.py Thu Apr 14 17:42:18 2016 +0000 +++ b/hgext/obsolete.py Fri Sep 14 11:32:28 2012 -0400 @@ -3,12 +3,12 @@ # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -"""Deprecated extension that formely introduces "Changeset Obsolescence". +"""Deprecated extension that formerly introduced "Changeset Obsolescence". -This concept is now partially in Mercurial core (starting with mercurial 2.3). -The remaining logic have been grouped with the evolve extension. +This concept is now partially in Mercurial core (starting with Mercurial 2.3). +The remaining logic has been grouped with the evolve extension. -Some code cemains in this extensions to detect and convert prehistoric format +Some code remains in this extensions to detect and convert prehistoric format of obsolete marker than early user may have create. Keep it enabled if you were such user. """ @@ -57,10 +57,10 @@ raise error.Abort('old format of obsolete marker detected!\n' 'run `hg debugconvertobsolete` once.') -def _obsdeserialise(flike): - """read a file like object serialised with _obsserialise +def _obsdeserialize(flike): + """read a file like object serialized with _obsserialize - this desierialize into a {subject -> objects} mapping + this deserialize into a {subject -> objects} mapping this was the very first format ever.""" rels = {} @@ -138,9 +138,9 @@ meta = dict((k.encode('utf-8'), v.encode('utf-8')) for k, v in oldmark.iteritems()) try: - succs = [bin(n) for n in oldsubjects] - succs = [n for n in succs if n != nullid] - store.create(tr, bin(oldobject), succs, + sucs = [bin(n) for n in oldsubjects] + sucs = [n for n in sucs if n != nullid] + store.create(tr, bin(oldobject), sucs, 0, metadata=meta) cnt += 1 except ValueError: diff -r 30fa0c553695 -r 9c234779ab7a tests/test-split.t --- a/tests/test-split.t Thu Apr 14 17:42:18 2016 +0000 +++ b/tests/test-split.t Fri Sep 14 11:32:28 2012 -0400 @@ -123,7 +123,7 @@ summary: add _a -Cannot split a commit with uncommited changes +Cannot split a commit with uncommitted changes $ hg up "desc(_c)" 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo "_cd" > _c diff -r 30fa0c553695 -r 9c234779ab7a tests/test-stabilize-order.t --- a/tests/test-stabilize-order.t Thu Apr 14 17:42:18 2016 +0000 +++ b/tests/test-stabilize-order.t Fri Sep 14 11:32:28 2012 -0400 @@ -132,7 +132,7 @@ no troubled changesets [1] -Test behaviour with --any +Test behavior with --any $ hg up 8 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 30fa0c553695 -r 9c234779ab7a tests/test-tutorial.t --- a/tests/test-tutorial.t Thu Apr 14 17:42:18 2016 +0000 +++ b/tests/test-tutorial.t Fri Sep 14 11:32:28 2012 -0400 @@ -74,7 +74,7 @@ Fixing mistake with `hg amend` -------------------------------- -We are versionning a shopping list +We are versioning a shopping list $ cd local $ cat >> shopping << EOF @@ -86,7 +86,7 @@ > Blancmange > Salmon mousse > EOF - $ hg commit -A -m "Monthy Python Shopping list" + $ hg commit -A -m "Monty Python Shopping list" adding shopping Its first version is shared with the outside. @@ -118,11 +118,11 @@ This history is very linear $ hg log -G - @ d85de4546133 (draft): adding fruit + @ aae8257dd79c (draft): adding fruit | - o 4d5dc8187023 (draft): adding condiment + o fd8bfdcd5133 (draft): adding condiment | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list But a typo was made in Babanas! @@ -132,8 +132,8 @@ # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID d85de4546133030c82d257bbcdd9b1b416d0c31c - # Parent 4d5dc81870237d492284826e21840b2ca00e26d1 + # Node ID aae8257dd79ce1c8de4e2b3caefc6cd782ae9796 + # Parent fd8bfdcd5133c73c46b165ec276c5695fccf5c4b adding fruit diff --git a/shopping b/shopping @@ -151,11 +151,11 @@ the outside. The first one has been exchanged and is "public" (immutable). $ hg log -G - @ d85de4546133 (draft): adding fruit + @ aae8257dd79c (draft): adding fruit | - o 4d5dc8187023 (draft): adding condiment + o fd8bfdcd5133 (draft): adding condiment | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list hopefully. I can use `hg commit --amend` to rewrite my faulty changeset! @@ -178,19 +178,19 @@ A new changeset with the right diff replace the wrong one. $ hg log -G - @ 9d0363b81950 (draft): adding fruit + @ a114c282451d (draft): adding fruit | - o 4d5dc8187023 (draft): adding condiment + o fd8bfdcd5133 (draft): adding condiment | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list $ hg export tip # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID 9d0363b81950646bc6ad1ec5de8b8197ea586541 - # Parent 4d5dc81870237d492284826e21840b2ca00e26d1 + # Node ID a114c282451d30a10a190d40dac49e12a654ff10 + # Parent fd8bfdcd5133c73c46b165ec276c5695fccf5c4b adding fruit diff --git a/shopping b/shopping @@ -207,7 +207,7 @@ Getting rid of branchy history ---------------------------------- -While I was working on my list. someone made a change remotly. +While I was working on my list. someone made a change remotely. $ cd ../remote $ hg up -q @@ -229,35 +229,35 @@ I now have a new heads. Note that this remote head is immutable $ hg log -G - o 9ca060c80d74 (public): SPAM + o dfb2eedad5f4 (public): SPAM | - | @ 9d0363b81950 (draft): adding fruit + | @ a114c282451d (draft): adding fruit | | - | o 4d5dc8187023 (draft): adding condiment + | o fd8bfdcd5133 (draft): adding condiment |/ - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list instead of merging my head with the new one. I'm going to rebase my work $ hg diff - $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023 - rebasing 1:4d5dc8187023 "adding condiment" + $ hg rebase --dest dfb2eedad5f4 --source fd8bfdcd5133 + rebasing 1:fd8bfdcd5133 "adding condiment" merging shopping - rebasing 4:9d0363b81950 "adding fruit" + rebasing 4:a114c282451d "adding fruit" merging shopping My local work is now rebased on the remote one. $ hg log -G - @ 41aff6a42b75 (draft): adding fruit + @ 3997e380aadb (draft): adding fruit | - o dfd3a2d7691e (draft): adding condiment + o dd8b32153d42 (draft): adding condiment | - o 9ca060c80d74 (public): SPAM + o dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list Removing changesets @@ -273,15 +273,15 @@ > EOF $ hg ci -m 'transport' $ hg log -G - @ 1125e39fbf21 (draft): transport + @ 12d7a1c26dd2 (draft): transport | - o 41aff6a42b75 (draft): adding fruit + o 3997e380aadb (draft): adding fruit | - o dfd3a2d7691e (draft): adding condiment + o dd8b32153d42 (draft): adding condiment | - o 9ca060c80d74 (public): SPAM + o dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list I have a new commit but I realize that don't want it. (transport shop list does @@ -289,19 +289,19 @@ $ hg prune . # "." is for working directory parent 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory now at 41aff6a42b75 + working directory now at 3997e380aadb 1 changesets pruned The silly changeset is gone. $ hg log -G - @ 41aff6a42b75 (draft): adding fruit + @ 3997e380aadb (draft): adding fruit | - o dfd3a2d7691e (draft): adding condiment + o dd8b32153d42 (draft): adding condiment | - o 9ca060c80d74 (public): SPAM + o dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list Reordering changesets @@ -323,20 +323,20 @@ $ sed -i'' -e 's/Spam/Spam Spam Spam/g' shopping $ hg ci -m 'SPAM SPAM' $ hg log -G - @ fac207dec9f5 (draft): SPAM SPAM + @ 2262f535e11b (draft): SPAM SPAM | - o 10b8aeaa8cc8 (draft): bathroom stuff + o 9c5c4ca7aaf2 (draft): bathroom stuff | - o 41aff6a42b75 (draft): adding fruit + o 3997e380aadb (draft): adding fruit | - o dfd3a2d7691e (draft): adding condiment + o dd8b32153d42 (draft): adding condiment | - o 9ca060c80d74 (public): SPAM + o dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list -.. note:: We can't amend changeset 7e82d3f3c2cb or 9ca060c80d74 as they are immutable. +.. note:: We can't amend changeset 01b60331571c or dfb2eedad5f4 as they are immutable. I now want to push to remote all my changes except the bathroom one, which I'm not totally happy with yet. To be able to push "SPAM SPAM" I need a version of @@ -346,24 +346,24 @@ .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>` - $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent + $ hg up 'p1(9c5c4ca7aaf2)' # going on "bathroom stuff" parent 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent - rebasing 10:fac207dec9f5 "SPAM SPAM" (tip) + $ hg grab 2262f535e11b # moving "SPAM SPAM" to the working directory parent + rebasing 10:2262f535e11b "SPAM SPAM" (tip) merging shopping - ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg log -G - @ a224f2a4fb9f (draft): SPAM SPAM + @ b0023982be53 (draft): SPAM SPAM | - | o 10b8aeaa8cc8 (draft): bathroom stuff + | o 9c5c4ca7aaf2 (draft): bathroom stuff |/ - o 41aff6a42b75 (draft): adding fruit + o 3997e380aadb (draft): adding fruit | - o dfd3a2d7691e (draft): adding condiment + o dd8b32153d42 (draft): adding condiment | - o 9ca060c80d74 (public): SPAM + o dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list We have a new SPAM SPAM version without the bathroom stuff @@ -377,8 +377,8 @@ # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID a224f2a4fb9f9f828f608959912229d7b38b26de - # Parent 41aff6a42b7578ec7ec3cb2041633f1ca43cca96 + # Node ID b0023982be539d96df8fafa5257eab26e09192c8 + # Parent 3997e380aadbbbf75961f17fc5c68cc131cc8405 SPAM SPAM diff --git a/shopping b/shopping @@ -394,7 +394,7 @@ To make sure I do not push unready changeset by mistake I set the "bathroom stuff" changeset in the secret phase. - $ hg phase --force --secret 10b8aeaa8cc8 + $ hg phase --force --secret 9c5c4ca7aaf2 we can now push our change: @@ -409,23 +409,23 @@ for simplicity sake we get the bathroom change in line again - $ hg grab 10b8aeaa8cc8 - rebasing 9:10b8aeaa8cc8 "bathroom stuff" + $ hg grab 9c5c4ca7aaf2 + rebasing 9:9c5c4ca7aaf2 "bathroom stuff" merging shopping - ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg phase --draft . $ hg log -G - @ 75954b8cd933 (draft): bathroom stuff + @ 54c3c44b4486 (draft): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o b0023982be53 (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o 3997e380aadb (public): adding fruit | - o dfd3a2d7691e (public): adding condiment + o dd8b32153d42 (public): adding condiment | - o 9ca060c80d74 (public): SPAM + o dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list @@ -528,17 +528,17 @@ 1 new obsolescence markers (run 'hg update' to get a working copy) $ hg log -G - o 75954b8cd933 (public): bathroom stuff + o 54c3c44b4486 (public): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o b0023982be53 (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o 3997e380aadb (public): adding fruit | - o dfd3a2d7691e (public): adding condiment + o dd8b32153d42 (public): adding condiment | - @ 9ca060c80d74 (public): SPAM + @ dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list @@ -550,15 +550,15 @@ $ hg rollback repository tip rolled back to revision 4 (undo pull) $ hg log -G - o a224f2a4fb9f (public): SPAM SPAM + o b0023982be53 (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o 3997e380aadb (public): adding fruit | - o dfd3a2d7691e (public): adding condiment + o dd8b32153d42 (public): adding condiment | - @ 9ca060c80d74 (public): SPAM + @ dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list Let's make the local repo "non publishing" @@ -585,17 +585,17 @@ 1 new obsolescence markers (run 'hg update' to get a working copy) $ hg log -G - o 75954b8cd933 (draft): bathroom stuff + o 54c3c44b4486 (draft): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o b0023982be53 (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o 3997e380aadb (public): adding fruit | - o dfd3a2d7691e (public): adding condiment + o dd8b32153d42 (public): adding condiment | - @ 9ca060c80d74 (public): SPAM + @ dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list Rebasing unstable change after pull @@ -603,7 +603,7 @@ Remotely someone add a new changeset on top of the mutable "bathroom" on. - $ hg up 75954b8cd933 -q + $ hg up 54c3c44b4486 -q $ cat >> shopping << EOF > Giraffe > Rhino @@ -615,21 +615,21 @@ But at the same time, locally, this same "bathroom changeset" was updated. $ cd ../local - $ hg up 75954b8cd933 -q + $ hg up 54c3c44b4486 -q $ sed -i'' -e 's/... More bathroom stuff to come/Bath Robe/' shopping $ hg commit --amend $ hg log -G - @ a44c85f957d3 (draft): bathroom stuff + @ d7146c8844e2 (draft): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o b0023982be53 (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o 3997e380aadb (public): adding fruit | - o dfd3a2d7691e (public): adding condiment + o dd8b32153d42 (public): adding condiment | - o 9ca060c80d74 (public): SPAM + o dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list @@ -650,27 +650,27 @@ see both version showing up in the log. $ hg log -G - o bf1b0d202029 (draft): animals + o aa715c4a19e6 (draft): animals | - | @ a44c85f957d3 (draft): bathroom stuff + | @ d7146c8844e2 (draft): bathroom stuff | | - x | 75954b8cd933 (draft): bathroom stuff + x | 54c3c44b4486 (draft): bathroom stuff |/ - o a224f2a4fb9f (public): SPAM SPAM + o b0023982be53 (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o 3997e380aadb (public): adding fruit | - o dfd3a2d7691e (public): adding condiment + o dd8b32153d42 (public): adding condiment | - o 9ca060c80d74 (public): SPAM + o dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list -The older version 75954b8cd933 never ceased to exist in the local repo. It was +The older version 54c3c44b4486 never ceased to exist in the local repo. It was just hidden and excluded from pull and push. -.. note:: In hgview there is a nice dotted relation highlighting a44c85f957d3 as a new version of 75954b8cd933. this is not yet ported to ``hg log -G``. +.. note:: In hgview there is a nice dotted relation highlighting a44c85f957d3 as a new version of 54c3c44b4486. this is not yet ported to ``hg log -G``. There is now an **unstable** changeset in this history. Mercurial will refuse to share it with the outside: @@ -678,7 +678,7 @@ $ hg push other pushing to $TESTTMP/other (glob) searching for changes - abort: push includes unstable changeset: bf1b0d202029! + abort: push includes unstable changeset: aa715c4a19e6! (use 'hg evolve' to get a stable history or --force to ignore warnings) [255] @@ -693,7 +693,7 @@ $ hg evolve --dry-run move:[15] animals atop:[14] bathroom stuff - hg rebase -r bf1b0d202029 -d a44c85f957d3 + hg rebase -r aa715c4a19e6 -d d7146c8844e2 Let's do it @@ -701,24 +701,24 @@ move:[15] animals atop:[14] bathroom stuff merging shopping - working directory is now at ee942144f952 + working directory is now at 4783a0ff199d The old version of bathroom is hidden again. $ hg log -G - @ ee942144f952 (draft): animals + @ 4783a0ff199d (draft): animals | - o a44c85f957d3 (draft): bathroom stuff + o d7146c8844e2 (draft): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o b0023982be53 (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o 3997e380aadb (public): adding fruit | - o dfd3a2d7691e (public): adding condiment + o dd8b32153d42 (public): adding condiment | - o 9ca060c80d74 (public): SPAM + o dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list @@ -746,13 +746,13 @@ now let's see where we are, and update to the successor $ hg parents - bf1b0d202029 (draft): animals + aa715c4a19e6 (draft): animals working directory parent is obsolete! (use "hg evolve" to update to its successor) $ hg evolve update:[8] animals 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at ee942144f952 + working directory is now at 4783a0ff199d Relocating unstable change after prune ---------------------------------------------- @@ -774,28 +774,28 @@ added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) $ hg log -G - o 99f039c5ec9e (draft): SPAM SPAM SPAM + o fc817bcb9392 (draft): SPAM SPAM SPAM | - @ ee942144f952 (draft): animals + @ 4783a0ff199d (draft): animals | - o a44c85f957d3 (draft): bathroom stuff + o d7146c8844e2 (draft): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o b0023982be53 (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o 3997e380aadb (public): adding fruit | - o dfd3a2d7691e (public): adding condiment + o dd8b32153d42 (public): adding condiment | - o 9ca060c80d74 (public): SPAM + o dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: - $ hg prune ee942144f952 + $ hg prune 4783a0ff199d 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory now at a44c85f957d3 + working directory now at d7146c8844e2 1 changesets pruned 1 new unstable changesets @@ -804,46 +804,46 @@ is neither dead or obsolete. My repository is in an unstable state again. $ hg log -G - o 99f039c5ec9e (draft): SPAM SPAM SPAM + o fc817bcb9392 (draft): SPAM SPAM SPAM | - x ee942144f952 (draft): animals + x 4783a0ff199d (draft): animals | - @ a44c85f957d3 (draft): bathroom stuff + @ d7146c8844e2 (draft): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o b0023982be53 (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o 3997e380aadb (public): adding fruit | - o dfd3a2d7691e (public): adding condiment + o dd8b32153d42 (public): adding condiment | - o 9ca060c80d74 (public): SPAM + o dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list $ hg log -r 'unstable()' - 99f039c5ec9e (draft): SPAM SPAM SPAM + fc817bcb9392 (draft): SPAM SPAM SPAM $ hg evolve move:[17] SPAM SPAM SPAM atop:[14] bathroom stuff merging shopping - working directory is now at 40aa40daeefb + working directory is now at 96226e87b42a $ hg log -G - @ 40aa40daeefb (draft): SPAM SPAM SPAM + @ 96226e87b42a (draft): SPAM SPAM SPAM | - o a44c85f957d3 (draft): bathroom stuff + o d7146c8844e2 (draft): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o b0023982be53 (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o 3997e380aadb (public): adding fruit | - o dfd3a2d7691e (public): adding condiment + o dd8b32153d42 (public): adding condiment | - o 9ca060c80d74 (public): SPAM + o dfb2eedad5f4 (public): SPAM | - o 7e82d3f3c2cb (public): Monthy Python Shopping list + o 01b60331571c (public): Monty Python Shopping list