spelling: Construct

tests/test-rebase-abort.t

@@ -1,158 +1,158
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > graphlog=
   > rebase=
   > 
   > [phases]
   > publish=False
   > 
   > [alias]
   > tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n"
   > EOF
 
 
   $ hg init a
   $ cd a
 
   $ echo c1 > common
   $ hg add common
   $ hg ci -m C1
 
   $ echo c2 >> common
   $ hg ci -m C2
 
   $ echo c3 >> common
   $ hg ci -m C3
 
   $ hg up -q -C 1
 
   $ echo l1 >> extra
   $ hg add extra
   $ hg ci -m L1
   created new head
 
   $ sed -e 's/c2/l2/' common > common.new
   $ mv common.new common
   $ hg ci -m L2
 
   $ hg phase --force --secret 2
 
   $ hg tglog
   @  4:draft 'L2'
   |
   o  3:draft 'L1'
   |
   | o  2:secret 'C3'
   |/
   o  1:draft 'C2'
   |
   o  0:draft 'C1'
   
 
 Conflicting rebase:
 
   $ hg rebase -s 3 -d 2
   merging common
   warning: conflicts during merge.
   merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
   abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Abort:
 
   $ hg rebase --abort
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
   rebase aborted
 
   $ hg tglog
   @  4:draft 'L2'
   |
   o  3:draft 'L1'
   |
   | o  2:secret 'C3'
   |/
   o  1:draft 'C2'
   |
   o  0:draft 'C1'
   
   $ cd ..
 
 
-Constrcut new repo:
+Construct new repo:
 
   $ hg init b
   $ cd b
 
   $ echo a > a
   $ hg ci -Am A
   adding a
 
   $ echo b > b
   $ hg ci -Am B
   adding b
 
   $ echo c > c
   $ hg ci -Am C
   adding c
 
   $ hg up -q 0
 
   $ echo b > b
   $ hg ci -Am 'B bis'
   adding b
   created new head
 
   $ echo c1 > c
   $ hg ci -Am C1
   adding c
 
   $ hg phase --force --secret 1
   $ hg phase --public 1
 
 Rebase and abort without generating new changesets:
 
   $ hg tglog
   @  4:draft 'C1'
   |
   o  3:draft 'B bis'
   |
   | o  2:secret 'C'
   | |
   | o  1:public 'B'
   |/
   o  0:public 'A'
   
   $ hg rebase -b 4 -d 2
   merging c
   warning: conflicts during merge.
   merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
   abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
   $ hg tglog
   @  4:draft 'C1'
   |
   o  3:draft 'B bis'
   |
   | @  2:secret 'C'
   | |
   | o  1:public 'B'
   |/
   o  0:public 'A'
   
   $ hg rebase -a
   rebase aborted
 
   $ hg tglog
   @  4:draft 'C1'
   |
   o  3:draft 'B bis'
   |
   | o  2:secret 'C'
   | |
   | o  1:public 'B'
   |/
   o  0:public 'A'
   
 
   $ cd ..