tests/test-obsolete-rebase.t
author Pierre-Yves David <pierre-yves.david@logilab.fr>
Fri, 06 Jul 2012 18:32:10 +0200
branchstable
changeset 344 9bbcd2746898
parent 311 5eecfda0a5c7
child 346 f4302a2079f4
permissions -rw-r--r--
obsolete: fix bug in detection of remote obsolete support We were checking again local...
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
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
    31
  $ echo e > e
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
    32
  $ hg ci -Am adde e
311
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    33
  $ hg rebase -d 1 -r 3 --detach --keep  
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    34
  $ glog
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    35
  @  4:9c5494949763@default(draft) adde
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    36
  |
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    37
  | o  3:98e4a024635e@default(draft) adde
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    38
  | |
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    39
  | o  2:102a90ea7b4a@default(draft) addb
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    40
  | |
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    41
  o |  1:540395c44225@default(draft) changea
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    42
  |/
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    43
  o  0:07f494440405@default(draft) adda
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    44
  
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    45
  $ glog --hidden
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    46
  @  4:9c5494949763@default(draft) adde
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    47
  |
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    48
  | o  3:98e4a024635e@default(draft) adde
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    49
  | |
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    50
  | o  2:102a90ea7b4a@default(draft) addb
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    51
  | |
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    52
  o |  1:540395c44225@default(draft) changea
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    53
  |/
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    54
  o  0:07f494440405@default(draft) adda
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    55
  
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    56
  $ hg debugsuccessors
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    57
  $ hg --config extensions.hgext.mq= strip tip
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    58
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    59
  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9c5494949763-backup.hg
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    60
  $ hg rebase -d 1 -r 3 --detach
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    61
  $ glog
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    62
  @  4:9c5494949763@default(draft) adde
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    63
  |
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    64
  | o  2:102a90ea7b4a@default(draft) addb
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    65
  | |
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    66
  o |  1:540395c44225@default(draft) changea
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    67
  |/
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    68
  o  0:07f494440405@default(draft) adda
5eecfda0a5c7 obsolete: enable rebase --keep again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
    69
  
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    70
  $ glog --hidden
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
    71
  @  4:9c5494949763@default(draft) adde
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    72
  |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
    73
  | o  3:98e4a024635e@default(secret) adde
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
    74
  | |
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
    75
  | o  2:102a90ea7b4a@default(draft) addb
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    76
  | |
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    77
  o |  1:540395c44225@default(draft) changea
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    78
  |/
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    79
  o  0:07f494440405@default(draft) adda
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    80
  
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    81
  $ hg debugsuccessors
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
    82
  98e4a024635e 9c5494949763
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    83
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    84
Test rebase with deleted empty revision
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    85
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    86
  $ hg up 0
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    87
  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
    88
  $ hg branch foo
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    89
  marked working directory as branch foo
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    90
  (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
    91
  $ echo a >> a
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    92
  $ hg ci -m changea
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    93
  $ hg rebase -d 1
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    94
  $ glog --hidden
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
    95
  o  5:4e322f7ce8e3@foo(secret) changea
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    96
  |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
    97
  | o  4:9c5494949763@default(draft) adde
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
    98
  | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
    99
  | | o  3:98e4a024635e@default(secret) adde
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   100
  | | |
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   101
  +---o  2:102a90ea7b4a@default(draft) addb
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
   102
  | |
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
   103
  | @  1:540395c44225@default(draft) changea
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
   104
  |/
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
   105
  o  0:07f494440405@default(draft) adda
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
   106
  
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
   107
  $ hg debugsuccessors
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
   108
  4e322f7ce8e3 000000000000
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   109
  98e4a024635e 9c5494949763
282
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   110
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   111
Test rebase --collapse
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   112
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   113
  $ hg up 0
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   114
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   115
  $ echo c > c
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   116
  $ hg ci -Am addc
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   117
  adding c
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   118
  created new head
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   119
  $ echo c >> c
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   120
  $ hg ci -m changec
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   121
  $ hg rebase --collapse -d 1
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   122
  merging c
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   123
  $ glog --hidden
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   124
  @  8:a7773ffa7edc@default(draft) Collapsed revision
282
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   125
  |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   126
  | o  7:03f31481307a@default(secret) changec
282
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   127
  | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   128
  | o  6:076e9b2ffbe1@default(secret) addc
282
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   129
  | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   130
  | | o  5:4e322f7ce8e3@foo(secret) changea
282
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   131
  | |/
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   132
  +---o  4:9c5494949763@default(draft) adde
282
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   133
  | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   134
  | | o  3:98e4a024635e@default(secret) adde
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   135
  | | |
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   136
  | | o  2:102a90ea7b4a@default(draft) addb
282
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   137
  | |/
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   138
  o |  1:540395c44225@default(draft) changea
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   139
  |/
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   140
  o  0:07f494440405@default(draft) adda
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   141
  
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   142
  $ hg debugsuccessors
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   143
  03f31481307a a7773ffa7edc
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   144
  076e9b2ffbe1 a7773ffa7edc
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   145
  4e322f7ce8e3 000000000000
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   146
  98e4a024635e 9c5494949763
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   147
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   148
Test rebase --abort
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   149
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   150
  $ hg debugsuccessors > ../successors.old
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   151
  $ hg up 0
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   152
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   153
  $ echo d > d
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   154
  $ hg ci -Am addd d
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   155
  created new head
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   156
  $ echo b >> a
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   157
  $ hg ci -m appendab
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   158
  $ hg rebase -d 1
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   159
  merging a
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   160
  warning: conflicts during merge.
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   161
  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   162
  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   163
  [255]
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   164
  $ hg rebase --abort
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   165
  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/03f165c84ea8-backup.hg
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   166
  rebase aborted
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   167
  $ hg debugsuccessors > ../successors.new
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   168
  $ diff -u ../successors.old ../successors.new
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   169
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   170
Test rebase --continue
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   171
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   172
  $ hg rebase -d 1
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   173
  merging a
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   174
  warning: conflicts during merge.
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   175
  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   176
  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   177
  [255]
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   178
  $ hg resolve --tool internal:other a
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   179
  $ hg rebase --continue
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   180
  $ glog --hidden
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   181
  @  12:1951ead97108@default(draft) appendab
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   182
  |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   183
  o  11:03f165c84ea8@default(draft) addd
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   184
  |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   185
  | o  10:4b9d80f48523@default(secret) appendab
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   186
  | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   187
  | o  9:a31943eabc43@default(secret) addd
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   188
  | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   189
  +---o  8:a7773ffa7edc@default(draft) Collapsed revision
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   190
  | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   191
  | | o  7:03f31481307a@default(secret) changec
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   192
  | | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   193
  | | o  6:076e9b2ffbe1@default(secret) addc
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   194
  | |/
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   195
  | | o  5:4e322f7ce8e3@foo(secret) changea
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   196
  | |/
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   197
  +---o  4:9c5494949763@default(draft) adde
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   198
  | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   199
  | | o  3:98e4a024635e@default(secret) adde
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   200
  | | |
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   201
  | | o  2:102a90ea7b4a@default(draft) addb
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   202
  | |/
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   203
  o |  1:540395c44225@default(draft) changea
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   204
  |/
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   205
  o  0:07f494440405@default(draft) adda
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   206
  
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   207
  $ hg debugsuccessors > ../successors.new
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   208
  $ diff -u ../successors.old ../successors.new
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   209
  --- ../successors.old* (glob)
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   210
  +++ ../successors.new* (glob)
302
d68ccae92d52 obsolete: make collapse create less markers
Patrick Mezard <patrick@mezard.eu>
parents: 298
diff changeset
   211
  @@ -1,4 +1,6 @@
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   212
   03f31481307a a7773ffa7edc
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   213
   076e9b2ffbe1 a7773ffa7edc
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   214
  +4b9d80f48523 1951ead97108
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   215
   4e322f7ce8e3 000000000000
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
   216
   98e4a024635e 9c5494949763
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   217
  +a31943eabc43 03f165c84ea8
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
   218
  [1]