# HG changeset patch # User Greg Ward # Date 1403389881 14400 # Node ID b286f77d680cc26b60215d0067eeba53cca47177 # Parent 914255564352f84969de9f269d9b26d43571473b tests: fix grammar, spelling, punctuation in comments diff -r 914255564352 -r b286f77d680c tests/test-amend.t --- a/tests/test-amend.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-amend.t Sat Jun 21 18:31:21 2014 -0400 @@ -15,7 +15,7 @@ $ hg ci -Am adda adding a -Test amend captures branches +Test that amend captures branches $ hg branch foo marked working directory as branch foo diff -r 914255564352 -r b286f77d680c tests/test-exchange-A1.t --- a/tests/test-exchange-A1.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-exchange-A1.t Sat Jun 21 18:31:21 2014 -0400 @@ -54,8 +54,8 @@ $ cp -r A.1.1 A.1.1.b -Variante a: push -r A ---------------------- +Variant a: push -r A +-------------------- $ dotest A.1.1.a A ## Running testcase A.1.1.a @@ -105,8 +105,8 @@ -Variante b: push ---------------------- +Variant b: push +--------------- $ dotest A.1.1.b ## Running testcase A.1.1.b @@ -213,8 +213,8 @@ $ cp -r A.1.2 A.1.2.b -Variante a: push -r A ---------------------- +Variant a: push -r A +-------------------- $ dotest A.1.2.a B ## Running testcase A.1.2.a @@ -261,8 +261,8 @@ # obstore: pulldest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'} -Variante b: push ---------------------- +Variant b: push +--------------- $ dotest A.1.2.b ## Running testcase A.1.2.b diff -r 914255564352 -r b286f77d680c tests/test-exchange-A3.t --- a/tests/test-exchange-A3.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-exchange-A3.t Sat Jun 21 18:31:21 2014 -0400 @@ -73,8 +73,8 @@ $ cd .. $ cd .. -Actual Test for first version (changeset unknown remotly) ---------------------------------------------------------- +Actual Test for first version (changeset unknown in remote) +----------------------------------------------------------- $ dotest A.3.a A1 ## Running testcase A.3.a @@ -125,8 +125,8 @@ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} -other variant: changeset know remotly -------------------------------------------- +other variant: changeset known in remote +---------------------------------------- $ setuprepos A.3.b creating test repo for test case A.3.b @@ -164,8 +164,8 @@ $ cd .. $ cd .. -Actual Test for first version (changeset unknown remotly) ---------------------------------------------------------- +Actual Test for first version (changeset unknown in remote) +----------------------------------------------------------- check it complains about multiple heads diff -r 914255564352 -r b286f77d680c tests/test-exchange-A4.t --- a/tests/test-exchange-A4.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-exchange-A4.t Sat Jun 21 18:31:21 2014 -0400 @@ -66,8 +66,8 @@ $ cd .. $ cd .. -Actual Test for first version (changeset unknown remotly) ---------------------------------------------------------- +Actual Test for first version (changeset unknown in remote) +----------------------------------------------------------- $ dotest A.4 B -f ## Running testcase A.4 diff -r 914255564352 -r b286f77d680c tests/test-exchange-A6.t --- a/tests/test-exchange-A6.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-exchange-A6.t Sat Jun 21 18:31:21 2014 -0400 @@ -42,7 +42,7 @@ $ mkcommit A1 created new head -make both changeset known remotly +make both changeset known in remote $ hg push -qf ../pushdest $ hg push -qf ../pulldest @@ -106,7 +106,7 @@ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} Actual Test (bare push version) ------------------------------------ +------------------------------- $ dotest A.6.b ## Running testcase A.6.b diff -r 914255564352 -r b286f77d680c tests/test-exchange-B1.t --- a/tests/test-exchange-B1.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-exchange-B1.t Sat Jun 21 18:31:21 2014 -0400 @@ -3,7 +3,7 @@ $ . $TESTDIR/_exc-util.sh -=== B.1 Prune on non targeted common changeset === +=== B.1 Prune on non-targeted common changeset === .. {{{ .. ⊗ B @@ -53,7 +53,7 @@ $ cp -r B.1 B.1.a $ cp -r B.1 B.1.b -Actual Test (explicite push version) +Actual Test (explicit push version) ----------------------------------- $ dotest B.1.a A diff -r 914255564352 -r b286f77d680c tests/test-exchange-B2.t --- a/tests/test-exchange-B2.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-exchange-B2.t Sat Jun 21 18:31:21 2014 -0400 @@ -3,7 +3,7 @@ $ . $TESTDIR/_exc-util.sh -=== B.2 Pruned changeset on head. nothing pushed === +=== B.2 Pruned changeset on head: nothing pushed === .. {{{ .. ⊗ A @@ -48,7 +48,7 @@ $ cp -r B.2 B.2.a $ cp -r B.2 B.2.b -Actual Test (explicite push version) +Actual Test (explicit push version) ----------------------------------- $ dotest B.2.a O diff -r 914255564352 -r b286f77d680c tests/test-exchange-B4.t --- a/tests/test-exchange-B4.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-exchange-B4.t Sat Jun 21 18:31:21 2014 -0400 @@ -74,7 +74,7 @@ $ cp -r B.4 B.4.a $ cp -r B.4 B.4.b -Actual Test (explicite push version) +Actual Test (explicit push version) ----------------------------------- $ dotest B.4.a O diff -r 914255564352 -r b286f77d680c tests/test-exchange-B5.t --- a/tests/test-exchange-B5.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-exchange-B5.t Sat Jun 21 18:31:21 2014 -0400 @@ -72,8 +72,8 @@ $ cp -r B.5 B.5.a $ cp -r B.5 B.5.b -Actual Test (explicite push version) -------------------------------------- +Actual Test (explicit push version) +----------------------------------- $ dotest B.5.a B -f ## Running testcase B.5.a diff -r 914255564352 -r b286f77d680c tests/test-exchange-B7.t --- a/tests/test-exchange-B7.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-exchange-B7.t Sat Jun 21 18:31:21 2014 -0400 @@ -4,7 +4,7 @@ $ . $TESTDIR/_exc-util.sh -=== B.7 Prune on non targeted common changeset === +=== B.7 Prune on non-targeted common changeset === .. .. {{{ .. ⊗ B diff -r 914255564352 -r b286f77d680c tests/test-exchange-C1.t --- a/tests/test-exchange-C1.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-exchange-C1.t Sat Jun 21 18:31:21 2014 -0400 @@ -54,8 +54,8 @@ $ cp -r C.1 C.1.a $ cp -r C.1 C.1.b -Actual Test (explicite push) -------------------------------------- +Actual Test (explicit push) +--------------------------- $ dotest C.1.a O ## Running testcase C.1.a diff -r 914255564352 -r b286f77d680c tests/test-exchange-C2.t --- a/tests/test-exchange-C2.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-exchange-C2.t Sat Jun 21 18:31:21 2014 -0400 @@ -61,8 +61,8 @@ $ cp -r C.2 C.2.a $ cp -r C.2 C.2.b -Actual Test (explicite push) -------------------------------------- +Actual Test (explicit push) +--------------------------- $ dotest C.2.a A1 ## Running testcase C.2.a diff -r 914255564352 -r b286f77d680c tests/test-exchange-C3.t --- a/tests/test-exchange-C3.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-exchange-C3.t Sat Jun 21 18:31:21 2014 -0400 @@ -66,8 +66,8 @@ $ cp -r C.3 C.3.a $ cp -r C.3 C.3.b -Actual Test (explicite push) -------------------------------------- +Actual Test (explicit push) +--------------------------- $ dotest C.3.a O ## Running testcase C.3.a diff -r 914255564352 -r b286f77d680c tests/test-exchange-D1.t --- a/tests/test-exchange-D1.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-exchange-D1.t Sat Jun 21 18:31:21 2014 -0400 @@ -3,7 +3,7 @@ $ . $TESTDIR/_exc-util.sh -=== D.1 Pruned changeset based on a missing precursors of something we miss === +=== D.1 Pruned changeset based on missing precursor of something not present === .. {{{ .. B ⊗ diff -r 914255564352 -r b286f77d680c tests/test-exchange-D4.t --- a/tests/test-exchange-D4.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-exchange-D4.t Sat Jun 21 18:31:21 2014 -0400 @@ -69,8 +69,8 @@ $ cd .. $ cd .. -Actual Test for first version (changeset unknown remotly) ---------------------------------------------------------- +Actual Test for first version (changeset unknown in remote) +----------------------------------------------------------- $ dotest A.3.a A1 ## Running testcase A.3.a diff -r 914255564352 -r b286f77d680c tests/test-import.t --- a/tests/test-import.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-import.t Sat Jun 21 18:31:21 2014 -0400 @@ -1,6 +1,6 @@ This feature requires mercurial 3.0 -(and the `only(` revset is 3.0 specific) +(and the `only()` revset is 3.0 specific) $ (hg help revset | grep '"only(' > /dev/null) || exit 80 diff -r 914255564352 -r b286f77d680c tests/test-obsolete.t --- a/tests/test-obsolete.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-obsolete.t Sat Jun 21 18:31:21 2014 -0400 @@ -65,7 +65,7 @@ 2 - 4538525df7e2 -Test that obsolete parent a properly computed +Test that obsolete precursors are properly computed $ qlog -r 'precursors(.)' --hidden 2 @@ -85,13 +85,13 @@ @@ -0,0 +1,1 @@ +obsol_c -Test that obsolete successors a properly computed +Test that obsolete successors are properly computed $ qlog -r 'successors(2)' --hidden 3 - 0d3f46688ccc -test obsolete changeset with no-obsolete descendant +test obsolete changeset with non-obsolete descendant $ hg up 1 -q $ mkcommit "obsol_c'" # 4 (on 1) created new head @@ -257,7 +257,7 @@ 2 - 0d3f46688ccc -Pushing again does not advertise extinct changeset +Pushing again does not advertise extinct changesets $ hg push ../other-new pushing to ../other-new @@ -299,9 +299,9 @@ 0 - 1f0dee641bb7 -pushing to stuff that doesn't support obsolete +pushing to stuff that doesn't support obsolescence -DISABLED. the _enable switch it global :-/ +DISABLED. the _enable switch is global :-/ .. $ hg init ../other-old .. > # XXX I don't like this but changeset get published otherwise @@ -464,7 +464,7 @@ 0 - 1f0dee641bb7 -Check that auto update ignore hidden changeset +Check that auto update ignores hidden changeset $ hg up 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg up @@ -472,7 +472,7 @@ $ hg id -n 8 -Check that named update do too +Check that named update does too $ hg update default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -517,7 +517,7 @@ o 0 - 1f0dee641bb7 -should not rebase extinct changeset +should not rebase extinct changesets #excluded 'whole rebase set is extinct and ignored.' message not in core $ hg rebase -b '3' -d 4 --traceback @@ -537,7 +537,7 @@ Does not complain about new head if you obsolete the old one -(re necesarry when we start runnind discovery on unfiltered repo in core) +(re necessary when we start running discovery on unfiltered repo in core) $ hg push ../other-new --traceback pushing to ../other-new diff -r 914255564352 -r b286f77d680c tests/test-prune.t --- a/tests/test-prune.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-prune.t Sat Jun 21 18:31:21 2014 -0400 @@ -46,7 +46,7 @@ $ hg debugobsolete 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', ('p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', )?'user': 'blah'} (re) -prune leaving unstability behind +prune leaving instability behind $ hg prune 1 1 changesets pruned diff -r 914255564352 -r b286f77d680c tests/test-stabilize-conflict.t --- a/tests/test-stabilize-conflict.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-stabilize-conflict.t Sat Jun 21 18:31:21 2014 -0400 @@ -1,6 +1,6 @@ -================================================================= -This files test the proper behavior of evo during merge conflict. -================================================================= +========================================================= +Test the proper behavior of evolve during merge conflict. +========================================================= Initial setup @@ -186,8 +186,8 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: babar count up to five -proper behavior with conflict using an external merge tools ------------------------------------------------------------ +proper behavior with conflict using an external merge tool +---------------------------------------------------------- $ safesed 's/merge=.*/merge=touch/' $HGRCPATH $ safesed 's/touch.gui=.*/touch.gui=false/' $HGRCPATH diff -r 914255564352 -r b286f77d680c tests/test-stabilize-order.t --- a/tests/test-stabilize-order.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-stabilize-order.t Sat Jun 21 18:31:21 2014 -0400 @@ -85,7 +85,7 @@ o 0:c471ef929e6a@default(draft) addroot -Test stabilizing a descendant predecessors child +Test stabilizing a descendant predecessor's child $ hg up 7 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 914255564352 -r b286f77d680c tests/test-stabilize-result.t --- a/tests/test-stabilize-result.t Fri Jun 13 12:49:16 2014 -0700 +++ b/tests/test-stabilize-result.t Sat Jun 21 18:31:21 2014 -0400 @@ -99,10 +99,10 @@ $ hg evolve --continue grafting revision 5 -Stabilize of late comer with different parent -================================================== +Stabilize latecomer with different parent +========================================= -(the same parent case is handled in test-evolve.t) +(the same-parent case is handled in test-evolve.t) $ glog @ 8:1cf0aacfd363@default(draft) bk:[] newer a @@ -148,7 +148,7 @@ o 0:07f494440405@default(public) bk:[] adda -Stabilize ! +Stabilize! $ hg evolve --any --dry-run recreate:[12] newer a @@ -175,8 +175,8 @@ o 0:07f494440405@default(public) bk:[] adda -Stabilize divergenent changesets with same parent -================================================= +Stabilize divergent changesets with same parent +=============================================== $ rm a.orig $ hg up 9 @@ -230,7 +230,7 @@ o 0:07f494440405@default(public) bk:[] adda -Stabilize It +Stabilize it $ hg evolve -qn --traceback hg update -c eacc9c8240fe &&