tests/test-obsolete-rebase.t
author Patrick Mezard <patrick@mezard.eu>
Tue, 19 Jun 2012 18:02:34 +0200
changeset 279 0d87b1fbf32b
child 280 fd43e3908f09
permissions -rw-r--r--
obsolete: handle rebase removing empty changesets The new revision identifier returned by concludenode() was None and was not correctly translated to nullid.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
     1
  $ cat >> $HGRCPATH <<EOF
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
     2
  > [defaults]
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
     3
  > amend=-d "0 0"
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
     4
  > [extensions]
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
     5
  > hgext.rebase=
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
     6
  > hgext.graphlog=
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
     7
  > EOF
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
     8
  $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
     9
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    10
  $ glog() {
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    11
  >   hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n'\
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    12
  >     "$@"
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    13
  > }
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    14
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    15
  $ hg init repo
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    16
  $ cd repo
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    17
  $ echo a > a
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    18
  $ hg ci -Am adda
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    19
  adding a
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    20
  $ echo a >> a
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    21
  $ hg ci -m changea
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    22
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    23
Test regular rebase
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    24
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    25
  $ hg up 0
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    26
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    27
  $ echo b > b
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    28
  $ hg ci -Am addb
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    29
  adding b
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    30
  created new head
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    31
  $ hg rebase -d 1
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    32
  $ glog --hidden
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    33
  @  3:03f017c74faa@default(draft) addb
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    34
  |
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    35
  | o  2:102a90ea7b4a@default(secret) addb
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    36
  | |
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    37
  o |  1:540395c44225@default(draft) changea
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    38
  |/
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    39
  o  0:07f494440405@default(draft) adda
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    40
  
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    41
  $ hg debugsuccessors
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    42
  102a90ea7b4a 03f017c74faa
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    43
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    44
Test rebase with deleted empty revision
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    45
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    46
  $ hg up 0
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    47
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    48
  $ hg branch foo
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    49
  marked working directory as branch foo
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    50
  (branches are permanent and global, did you want a bookmark?)
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    51
  $ echo a >> a
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    52
  $ hg ci -m changea
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    53
  $ hg rebase -d 1
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    54
  $ glog --hidden
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    55
  o  4:4e322f7ce8e3@foo(secret) changea
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    56
  |
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    57
  | o  3:03f017c74faa@default(draft) addb
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    58
  | |
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    59
  +---o  2:102a90ea7b4a@default(secret) addb
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    60
  | |
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    61
  | @  1:540395c44225@default(draft) changea
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    62
  |/
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    63
  o  0:07f494440405@default(draft) adda
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    64
  
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    65
  $ hg debugsuccessors
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    66
  102a90ea7b4a 03f017c74faa
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    67
  4e322f7ce8e3 000000000000