Commits

time...@mozdev.org  committed 4270937 Draft

Spelling: obsolete

  • Participants
  • Parent commits 4c8344b
  • Branches default

Comments (0)

Files changed (1)

File tests/test-obsolete.t

   $ mkcommit c # 2
   $ hg up 1
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit obsol_c # 3
+  $ mkcommit obsolete_c # 3
   created new head
   $ getid 2
   4538525df7e2b9f09423636c61ef63a4cb872a2d
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -c
-  diff -r 4538525df7e2 -r 0d3f46688ccc obsol_c
+  diff -r 4538525df7e2 -r 0d3f46688ccc obsolete_c
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/obsol_c	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/obsolete_c	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
-  +obsol_c
+  +obsolete_c
 
 Test that obsolete successors a properly computed
 
 
 test obsolete changeset with no-obsolete descendant
   $ hg up 1 -q
-  $ mkcommit "obsol_c'" # 4 (on 1)
+  $ mkcommit "obsolete_c'" # 4 (on 1)
   created new head
   $ hg debugobsolete `getid 3` `getid 4`
   $ qlog
   >   --hidden
   @  5:a7a6f2b5d8a5@default(unstable/draft) add d
   |
-  | o  4:725c380fe99b@default(stable/draft) add obsol_c'
+  | o  4:725c380fe99b@default(stable/draft) add obsolete_c'
   | |
-  x |  3:0d3f46688ccc@default(suspended/draft) add obsol_c
+  x |  3:0d3f46688ccc@default(suspended/draft) add obsolete_c
   |/
   | x  2:4538525df7e2@default(extinct/draft) add c
   |/
   - 1f0dee641bb7
   $ hg up 3 -q
   Working directory parent is obsolete
-  $ mkcommit obsol_d # 6
+  $ mkcommit obsolete_d # 6
   created new head
   1 new unstable changesets
   $ hg debugobsolete `getid 5` `getid 6`
 
   $ hg up -q .^ # 3
   Working directory parent is obsolete
-  $ mkcommit "obsol_d'" # 7
+  $ mkcommit "obsolete_d'" # 7
   created new head
   1 new unstable changesets
   $ hg debugobsolete `getid 6` `getid 7`
 
   $ hg up .^ -q # 3
   Working directory parent is obsolete
-  $ mkcommit "obsol_d''"
+  $ mkcommit "obsolete_d''"
   created new head
   1 new unstable changesets
   $ hg debugobsolete `getid 7` `getid 8`
   working directory now based on revision 3
   $ hg summary
   parent: 3:725c380fe99b 
-   add obsol_c'
+   add obsolete_c'
   branch: default
   commit: 1 deleted, 2 unknown (clean)
   update: 4 new changesets, 4 branch heads (merge)
   adding file changes
   added 2 changesets with 1 changes to 1 files
   $ hg up -q 10
-  $ mkcommit "obsol_d'''"
+  $ mkcommit "obsolete_d'''"
   created new head
   $ hg debugobsolete `getid 11` `getid 12`
   $ hg push ../other-new --traceback
   $ hg phase --public 11
   1 new latecomer changesets
   $ hg --config extensions.graphlog=glog glog --template='{rev} - ({phase}) {node|short} {desc}\n'
-  @  12 - (draft) 6db5e282cb91 add obsol_d'''
+  @  12 - (draft) 6db5e282cb91 add obsolete_d'''
   |
-  | o  11 - (public) 9468a5f5d8b2 add obsol_d''
+  | o  11 - (public) 9468a5f5d8b2 add obsolete_d''
   |/
-  o  10 - (public) 2033b4e49474 add obsol_c
+  o  10 - (public) 2033b4e49474 add obsolete_c
   |
-  o  4 - (public) 725c380fe99b add obsol_c'
+  o  4 - (public) 725c380fe99b add obsolete_c'
   |
   o  1 - (public) 7c3bad9141dc add b
   |
   parent:      10:2033b4e49474
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     add obsol_d'''
+  summary:     add obsolete_d'''
   
   $ hg push ../other-new/
   pushing to ../other-new/
 
 Check hg commit --amend compat
 
-  $ hg up 'desc(obsol_c)'
+  $ hg up 'desc(obsolete_c)'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit f
   created new head
   |/   parent:      10:2033b4e49474
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    summary:     add obsol_d'''
+  |    summary:     add obsolete_d'''
   |
   | o  changeset:   11:9468a5f5d8b2
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    summary:     add obsol_d''
+  |    summary:     add obsolete_d''
   |
   o  changeset:   10:2033b4e49474
   |  parent:      4:725c380fe99b
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  summary:     add obsol_c
+  |  summary:     add obsolete_c
   |
   o  changeset:   4:725c380fe99b
   |  parent:      1:7c3bad9141dc
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  summary:     add obsol_c'
+  |  summary:     add obsolete_c'
   |
   o  changeset:   1:7c3bad9141dc
   |  user:        test
 
 Check conflict detection
 
-  $ hg up 9468a5f5d8b2 #  add obsol_d''
+  $ hg up 9468a5f5d8b2 #  add obsolete_d''
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit "obsolet_conflicting_d"
+  $ mkcommit "obsolete_conflicting_d"
   $ hg summary
   parent: 14:50f11e5e3a63 tip
-   add obsolet_conflicting_d
+   add obsolete_conflicting_d
   branch: default
   commit: (clean)
   update: 9 new changesets, 9 branch heads (merge)
   parent:      11:9468a5f5d8b2
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     add obsolet_conflicting_d
+  summary:     add obsolete_conflicting_d