tests/test-strip.t
author Pulkit Goyal <7895pulkit@gmail.com>
Tue, 27 Feb 2018 14:42:30 +0530
changeset 36457 0e8b76644e20
parent 35846 c4c1e3334bcb
child 36965 b89a7ef29013
permissions -rw-r--r--
py3: convert os.devnull to bytes using pycompat.bytestr os.devnull returns str on Python 3. Differential Revision: https://phab.mercurial-scm.org/D2477
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
26929
e8e78a3d94b1 test: use generaldelta in 'test-strip.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26736
diff changeset
     1
  $ echo "[format]" >> $HGRCPATH
e8e78a3d94b1 test: use generaldelta in 'test-strip.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26736
diff changeset
     2
  $ echo "usegeneraldelta=yes" >> $HGRCPATH
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
     3
  $ echo "[extensions]" >> $HGRCPATH
19827
8b9c73ddeec1 strip: rename test-mq-strip into test-strip
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 19090
diff changeset
     4
  $ echo "strip=" >> $HGRCPATH
33087
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
     5
  $ echo "drawdag=$TESTDIR/drawdag.py" >> $HGRCPATH
8452
cb93eee1fbcd tests: add missing interpreter lines
Martin Geisler <mg@lazybytes.net>
parents: 6635
diff changeset
     6
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
     7
  $ restore() {
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
     8
  >     hg unbundle -q .hg/strip-backup/*
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
     9
  >     rm .hg/strip-backup/*
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    10
  > }
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    11
  $ teststrip() {
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    12
  >     hg up -C $1
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    13
  >     echo % before update $1, strip $2
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    14
  >     hg parents
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    15
  >     hg --traceback strip $2
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    16
  >     echo % after update $1, strip $2
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    17
  >     hg parents
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    18
  >     restore
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    19
  > }
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    20
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    21
  $ hg init test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    22
  $ cd test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    23
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    24
  $ echo foo > bar
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    25
  $ hg ci -Ama
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    26
  adding bar
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    27
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    28
  $ echo more >> bar
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    29
  $ hg ci -Amb
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    30
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    31
  $ echo blah >> bar
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    32
  $ hg ci -Amc
11200
12e5149cafca strip: improve full backup message
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
    33
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    34
  $ hg up 1
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    35
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    36
  $ echo blah >> bar
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    37
  $ hg ci -Amd
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    38
  created new head
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    39
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    40
  $ echo final >> bar
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    41
  $ hg ci -Ame
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    42
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    43
  $ hg log
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    44
  changeset:   4:443431ffac4f
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    45
  tag:         tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    46
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    47
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    48
  summary:     e
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    49
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    50
  changeset:   3:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    51
  parent:      1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    52
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    53
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    54
  summary:     d
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    55
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    56
  changeset:   2:264128213d29
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    57
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    58
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    59
  summary:     c
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    60
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    61
  changeset:   1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    62
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    63
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    64
  summary:     b
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    65
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    66
  changeset:   0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    67
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    68
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    69
  summary:     a
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    70
  
6635
d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
    71
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    72
  $ teststrip 4 4
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    73
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    74
  % before update 4, strip 4
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    75
  changeset:   4:443431ffac4f
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    76
  tag:         tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    77
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    78
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    79
  summary:     e
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    80
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    81
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
    82
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    83
  % after update 4, strip 4
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    84
  changeset:   3:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    85
  tag:         tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    86
  parent:      1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    87
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    88
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    89
  summary:     d
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    90
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    91
  $ teststrip 4 3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    92
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    93
  % before update 4, strip 3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    94
  changeset:   4:443431ffac4f
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    95
  tag:         tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    96
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    97
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    98
  summary:     e
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
    99
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   100
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
   101
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   102
  % after update 4, strip 3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   103
  changeset:   1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   104
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   105
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   106
  summary:     b
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   107
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   108
  $ teststrip 1 4
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   109
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   110
  % before update 1, strip 4
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   111
  changeset:   1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   112
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   113
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   114
  summary:     b
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   115
  
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
   116
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   117
  % after update 1, strip 4
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   118
  changeset:   1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   119
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   120
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   121
  summary:     b
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   122
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   123
  $ teststrip 4 2
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   124
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   125
  % before update 4, strip 2
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   126
  changeset:   4:443431ffac4f
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   127
  tag:         tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   128
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   129
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   130
  summary:     e
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   131
  
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
   132
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   133
  % after update 4, strip 2
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   134
  changeset:   3:443431ffac4f
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   135
  tag:         tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   136
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   137
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   138
  summary:     e
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   139
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   140
  $ teststrip 4 1
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   141
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   142
  % before update 4, strip 1
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   143
  changeset:   4:264128213d29
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   144
  tag:         tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   145
  parent:      1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   146
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   147
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   148
  summary:     c
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   149
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   150
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
   151
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   152
  % after update 4, strip 1
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   153
  changeset:   0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   154
  tag:         tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   155
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   156
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   157
  summary:     a
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   158
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   159
  $ teststrip null 4
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   160
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   161
  % before update null, strip 4
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
   162
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   163
  % after update null, strip 4
6635
d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
   164
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   165
  $ hg log
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   166
  changeset:   4:264128213d29
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   167
  tag:         tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   168
  parent:      1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   169
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   170
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   171
  summary:     c
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   172
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   173
  changeset:   3:443431ffac4f
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   174
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   175
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   176
  summary:     e
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   177
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   178
  changeset:   2:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   179
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   180
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   181
  summary:     d
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   182
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   183
  changeset:   1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   184
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   185
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   186
  summary:     b
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   187
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   188
  changeset:   0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   189
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   190
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   191
  summary:     a
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   192
  
23898
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   193
  $ hg up -C 4
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   194
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   195
  $ hg parents
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   196
  changeset:   4:264128213d29
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   197
  tag:         tip
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   198
  parent:      1:ef3a871183d7
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   199
  user:        test
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   200
  date:        Thu Jan 01 00:00:00 1970 +0000
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   201
  summary:     c
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   202
  
23939
33d1b81c6ef0 repair._bundle: fix traceback for bad config value
Eric Sumner <ericsumner@fb.com>
parents: 23898
diff changeset
   203
26423
c93f91c1db1c strip: use bundle2 + cg2 by default when repository use general delta
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26173
diff changeset
   204
  $ hg --traceback strip 4
23898
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   205
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
   206
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg
23898
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   207
  $ hg parents
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   208
  changeset:   1:ef3a871183d7
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   209
  user:        test
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   210
  date:        Thu Jan 01 00:00:00 1970 +0000
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   211
  summary:     b
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   212
  
b21c2e0ee8a3 repair: add experimental option to write bundle2 files
Eric Sumner <ericsumner@fb.com>
parents: 23835
diff changeset
   213
  $ hg debugbundle .hg/strip-backup/*
34025
626a28f30dbd debugcommands: stabilize output of debugbundle by having a custom repr
Augie Fackler <raf@durin42.com>
parents: 33987
diff changeset
   214
  Stream params: {Compression: BZ}
626a28f30dbd debugcommands: stabilize output of debugbundle by having a custom repr
Augie Fackler <raf@durin42.com>
parents: 33987
diff changeset
   215
  changegroup -- {nbchanges: 1, version: 02}
26929
e8e78a3d94b1 test: use generaldelta in 'test-strip.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26736
diff changeset
   216
      264128213d290d868c54642d13aeaa3675551a78
34025
626a28f30dbd debugcommands: stabilize output of debugbundle by having a custom repr
Augie Fackler <raf@durin42.com>
parents: 33987
diff changeset
   217
  phase-heads -- {}
33032
8e3021fd1a44 strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 32698
diff changeset
   218
      264128213d290d868c54642d13aeaa3675551a78 draft
24073
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   219
  $ hg pull .hg/strip-backup/*
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   220
  pulling from .hg/strip-backup/264128213d29-0b39d6bf-backup.hg
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   221
  searching for changes
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   222
  adding changesets
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   223
  adding manifests
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   224
  adding file changes
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   225
  added 1 changesets with 0 changes to 0 files (+1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34621
diff changeset
   226
  new changesets 264128213d29
24073
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   227
  (run 'hg heads' to see heads, 'hg merge' to merge)
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   228
  $ rm .hg/strip-backup/*
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   229
  $ hg log --graph
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   230
  o  changeset:   4:264128213d29
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   231
  |  tag:         tip
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   232
  |  parent:      1:ef3a871183d7
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   233
  |  user:        test
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   234
  |  date:        Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   235
  |  summary:     c
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   236
  |
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   237
  | o  changeset:   3:443431ffac4f
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   238
  | |  user:        test
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   239
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   240
  | |  summary:     e
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   241
  | |
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   242
  | o  changeset:   2:65bd5f99a4a3
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   243
  |/   user:        test
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   244
  |    date:        Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   245
  |    summary:     d
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   246
  |
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   247
  @  changeset:   1:ef3a871183d7
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   248
  |  user:        test
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   249
  |  date:        Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   250
  |  summary:     b
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   251
  |
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   252
  o  changeset:   0:9ab35a2d17cb
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   253
     user:        test
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   254
     date:        Thu Jan 01 00:00:00 1970 +0000
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   255
     summary:     a
ff5caa8dfd99 bundlerepo: basic bundle2 support
Eric Sumner <ericsumner@fb.com>
parents: 23939
diff changeset
   256
  
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   257
  $ hg up -C 2
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   258
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   259
  $ hg merge 4
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   260
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   261
  (branch merge, don't forget to commit)
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   262
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   263
before strip of merge parent
6635
d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
   264
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   265
  $ hg parents
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   266
  changeset:   2:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   267
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   268
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   269
  summary:     d
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   270
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   271
  changeset:   4:264128213d29
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   272
  tag:         tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   273
  parent:      1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   274
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   275
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   276
  summary:     c
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   277
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   278
  $ hg strip 4
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   279
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
   280
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   281
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   282
after strip of merge parent
6635
d90d83ebea9e mq: don't update the working copy on strip if parents aren't stripped
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
   283
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   284
  $ hg parents
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   285
  changeset:   1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   286
  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   287
  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   288
  summary:     b
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   289
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   290
  $ restore
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   291
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   292
  $ hg up
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   293
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
32698
1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   294
  updated to "264128213d29: c"
28029
72072cfc7e91 update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27177
diff changeset
   295
  1 other heads for branch "default"
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19951
diff changeset
   296
  $ hg log -G
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   297
  @  changeset:   4:264128213d29
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   298
  |  tag:         tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   299
  |  parent:      1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   300
  |  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   301
  |  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   302
  |  summary:     c
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   303
  |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   304
  | o  changeset:   3:443431ffac4f
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   305
  | |  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   306
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   307
  | |  summary:     e
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   308
  | |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   309
  | o  changeset:   2:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   310
  |/   user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   311
  |    date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   312
  |    summary:     d
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   313
  |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   314
  o  changeset:   1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   315
  |  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   316
  |  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   317
  |  summary:     b
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   318
  |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   319
  o  changeset:   0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   320
     user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   321
     date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   322
     summary:     a
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   323
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   324
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   325
2 is parent of 3, only one strip should happen
11789
e2bce1c717fa strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11637
diff changeset
   326
12767
c3316b6a3219 strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 12682
diff changeset
   327
  $ hg strip "roots(2)" 3
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
   328
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19951
diff changeset
   329
  $ hg log -G
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   330
  @  changeset:   2:264128213d29
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   331
  |  tag:         tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   332
  |  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   333
  |  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   334
  |  summary:     c
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   335
  |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   336
  o  changeset:   1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   337
  |  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   338
  |  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   339
  |  summary:     b
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   340
  |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   341
  o  changeset:   0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   342
     user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   343
     date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   344
     summary:     a
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   345
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   346
  $ restore
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19951
diff changeset
   347
  $ hg log -G
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   348
  o  changeset:   4:443431ffac4f
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   349
  |  tag:         tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   350
  |  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   351
  |  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   352
  |  summary:     e
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   353
  |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   354
  o  changeset:   3:65bd5f99a4a3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   355
  |  parent:      1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   356
  |  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   357
  |  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   358
  |  summary:     d
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   359
  |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   360
  | @  changeset:   2:264128213d29
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   361
  |/   user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   362
  |    date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   363
  |    summary:     c
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   364
  |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   365
  o  changeset:   1:ef3a871183d7
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   366
  |  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   367
  |  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   368
  |  summary:     b
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   369
  |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   370
  o  changeset:   0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   371
     user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   372
     date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   373
     summary:     a
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   374
  
29952
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   375
Failed hook while applying "saveheads" bundle.
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   376
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   377
  $ hg strip 2 --config hooks.pretxnchangegroup.bad=false
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   378
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   379
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   380
  transaction abort!
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   381
  rollback completed
29954
769aee32fae0 strip: don't use "full" and "partial" to describe bundles
Martin von Zweigbergk <martinvonz@google.com>
parents: 29953
diff changeset
   382
  strip failed, backup bundle stored in '$TESTTMP/test/.hg/strip-backup/*-backup.hg' (glob)
29953
94ebf56db04e strip: clarify that user action is required to recover temp bundle
Martin von Zweigbergk <martinvonz@google.com>
parents: 29952
diff changeset
   383
  strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob)
94ebf56db04e strip: clarify that user action is required to recover temp bundle
Martin von Zweigbergk <martinvonz@google.com>
parents: 29952
diff changeset
   384
  (fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/*-temp.hg'") (glob)
29952
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   385
  abort: pretxnchangegroup.bad hook exited with status 1
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   386
  [255]
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   387
  $ restore
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   388
  $ hg log -G
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   389
  o  changeset:   4:443431ffac4f
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   390
  |  tag:         tip
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   391
  |  user:        test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   392
  |  date:        Thu Jan 01 00:00:00 1970 +0000
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   393
  |  summary:     e
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   394
  |
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   395
  o  changeset:   3:65bd5f99a4a3
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   396
  |  parent:      1:ef3a871183d7
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   397
  |  user:        test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   398
  |  date:        Thu Jan 01 00:00:00 1970 +0000
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   399
  |  summary:     d
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   400
  |
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   401
  | o  changeset:   2:264128213d29
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   402
  |/   user:        test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   403
  |    date:        Thu Jan 01 00:00:00 1970 +0000
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   404
  |    summary:     c
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   405
  |
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   406
  @  changeset:   1:ef3a871183d7
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   407
  |  user:        test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   408
  |  date:        Thu Jan 01 00:00:00 1970 +0000
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   409
  |  summary:     b
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   410
  |
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   411
  o  changeset:   0:9ab35a2d17cb
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   412
     user:        test
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   413
     date:        Thu Jan 01 00:00:00 1970 +0000
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   414
     summary:     a
44ef21621ad7 strip: report both bundle files in case of exception (issue5368)
Martin von Zweigbergk <martinvonz@google.com>
parents: 29593
diff changeset
   415
  
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   416
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   417
2 different branches: 2 strips
11789
e2bce1c717fa strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11637
diff changeset
   418
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   419
  $ hg strip 2 4
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
   420
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19951
diff changeset
   421
  $ hg log -G
18371
ff2c89ebf5d4 mq: stabilize update after strip of parent revision
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
   422
  o  changeset:   2:65bd5f99a4a3
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   423
  |  tag:         tip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   424
  |  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   425
  |  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   426
  |  summary:     d
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   427
  |
18371
ff2c89ebf5d4 mq: stabilize update after strip of parent revision
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
   428
  @  changeset:   1:ef3a871183d7
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   429
  |  user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   430
  |  date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   431
  |  summary:     b
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   432
  |
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   433
  o  changeset:   0:9ab35a2d17cb
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   434
     user:        test
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   435
     date:        Thu Jan 01 00:00:00 1970 +0000
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   436
     summary:     a
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   437
  
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   438
  $ restore
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   439
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   440
2 different branches and a common ancestor: 1 strip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   441
12767
c3316b6a3219 strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 12682
diff changeset
   442
  $ hg strip 1 "2|4"
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   443
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
   444
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   445
  $ restore
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   446
20885
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
   447
verify fncache is kept up-to-date
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
   448
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
   449
  $ touch a
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
   450
  $ hg ci -qAm a
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
   451
  $ cat .hg/store/fncache | sort
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
   452
  data/a.i
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
   453
  data/bar.i
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
   454
  $ hg strip tip
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
   455
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
   456
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
   457
  $ cat .hg/store/fncache
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
   458
  data/bar.i
f49d60fa40a5 fncache: clean up fncache during strips
Durham Goode <durham@fb.com>
parents: 20117
diff changeset
   459
12767
c3316b6a3219 strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 12682
diff changeset
   460
stripping an empty revset
c3316b6a3219 strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 12682
diff changeset
   461
c3316b6a3219 strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 12682
diff changeset
   462
  $ hg strip "1 and not 1"
c3316b6a3219 strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 12682
diff changeset
   463
  abort: empty revision set
c3316b6a3219 strip: support revision sets
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 12682
diff changeset
   464
  [255]
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   465
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   466
remove branchy history for qimport tests
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   467
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   468
  $ hg strip 3
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
   469
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11637
64f284da1278 mq: cleanup status if applied mq is stripped (issue1881)
Vishakh H <vsh426@gmail.com>
parents: 11208
diff changeset
   470
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   471
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   472
strip of applied mq should cleanup status file
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   473
19827
8b9c73ddeec1 strip: rename test-mq-strip into test-strip
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 19090
diff changeset
   474
  $ echo "mq=" >> $HGRCPATH
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   475
  $ hg up -C 3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   476
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   477
  $ echo fooagain >> bar
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   478
  $ hg ci -mf
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   479
  $ hg qimport -r tip:2
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   480
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   481
applied patches before strip
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   482
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   483
  $ hg qapplied
26736
143b52fce68e mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents: 26429
diff changeset
   484
  d
143b52fce68e mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents: 26429
diff changeset
   485
  e
143b52fce68e mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents: 26429
diff changeset
   486
  f
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   487
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   488
stripping revision in queue
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   489
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   490
  $ hg strip 3
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   491
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
   492
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   493
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   494
applied patches after stripping rev in queue
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   495
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   496
  $ hg qapplied
26736
143b52fce68e mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents: 26429
diff changeset
   497
  d
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   498
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   499
stripping ancestor of queue
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   500
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   501
  $ hg strip 1
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   502
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12376
diff changeset
   503
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
11906
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   504
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   505
applied patches after stripping ancestor of queue
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   506
1219d019339d tests: unify test-mq-strip
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11789
diff changeset
   507
  $ hg qapplied
12682
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   508
19951
d51c4d85ec23 spelling: random spell checker fixes
Mads Kiilerich <madski@unity3d.com>
parents: 19827
diff changeset
   509
Verify strip protects against stripping wc parent when there are uncommitted mods
12682
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   510
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   511
  $ echo b > b
24709
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   512
  $ echo bb > bar
12682
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   513
  $ hg add b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   514
  $ hg ci -m 'b'
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   515
  $ hg log --graph
24709
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   516
  @  changeset:   1:76dcf9fab855
12682
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   517
  |  tag:         tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   518
  |  user:        test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   519
  |  date:        Thu Jan 01 00:00:00 1970 +0000
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   520
  |  summary:     b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   521
  |
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   522
  o  changeset:   0:9ab35a2d17cb
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   523
     user:        test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   524
     date:        Thu Jan 01 00:00:00 1970 +0000
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   525
     summary:     a
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   526
  
24709
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   527
  $ hg up 0
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   528
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   529
  $ echo c > bar
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   530
  $ hg up -t false
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   531
  merging bar
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   532
  merging bar failed!
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   533
  1 files updated, 0 files merged, 0 files removed, 1 files unresolved
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   534
  use 'hg resolve' to retry unresolved file merges
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   535
  [1]
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   536
  $ hg sum
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   537
  parent: 1:76dcf9fab855 tip
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   538
   b
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   539
  branch: default
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   540
  commit: 1 modified, 1 unknown, 1 unresolved
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   541
  update: (current)
25382
6084926366b9 summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents: 25111
diff changeset
   542
  phases: 2 draft
24709
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   543
  mq:     3 unapplied
12682
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   544
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   545
  $ echo c > b
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   546
  $ hg strip tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   547
  abort: local changes found
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   548
  [255]
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   549
  $ hg strip tip --keep
13572
1bb2a56a9d73 tests: use $TESTTMP more and use (glob) less
Martin Geisler <mg@aragost.com>
parents: 12767
diff changeset
   550
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
12682
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   551
  $ hg log --graph
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   552
  @  changeset:   0:9ab35a2d17cb
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   553
     tag:         tip
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   554
     user:        test
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   555
     date:        Thu Jan 01 00:00:00 1970 +0000
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   556
     summary:     a
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   557
  
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   558
  $ hg status
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   559
  M bar
58a3e2608ae4 strip: add --keep flag to avoid modifying wc during strip
Augie Fackler <durin42@gmail.com>
parents: 12640
diff changeset
   560
  ? b
24709
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   561
  ? bar.orig
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   562
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   563
  $ rm bar.orig
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   564
  $ hg sum
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   565
  parent: 0:9ab35a2d17cb tip
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   566
   a
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   567
  branch: default
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   568
  commit: 1 modified, 1 unknown
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   569
  update: (current)
25382
6084926366b9 summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents: 25111
diff changeset
   570
  phases: 1 draft
24709
69154e0ae384 strip: properly clear resolve state with --keep (issue4593)
Matt Mackall <mpm@selenic.com>
parents: 24686
diff changeset
   571
  mq:     3 unapplied
18760
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   572
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   573
Strip adds, removes, modifies with --keep
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   574
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   575
  $ touch b
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   576
  $ hg add b
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   577
  $ hg commit -mb
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   578
  $ touch c
19090
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   579
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   580
... with a clean working dir
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   581
18760
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   582
  $ hg add c
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   583
  $ hg rm bar
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   584
  $ hg commit -mc
19090
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   585
  $ hg status
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   586
  $ hg strip --keep tip
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   587
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   588
  $ hg status
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   589
  ! bar
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   590
  ? c
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   591
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   592
... with a dirty working dir
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   593
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   594
  $ hg add c
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   595
  $ hg rm bar
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   596
  $ hg commit -mc
ff01506c6852 test-mq-strip.t: add a test for strip --keep with clean working dir
Siddharth Agarwal <sid0@fb.com>
parents: 18760
diff changeset
   597
  $ hg status
18760
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   598
  $ echo b > b
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   599
  $ echo d > d
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   600
  $ hg strip --keep tip
27177
e76b27a642ca strip: add a --keep test related to removing files from dirstate
Christian Delahousse <cdelahousse@fb.com>
parents: 27030
diff changeset
   601
  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
18760
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   602
  $ hg status
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   603
  M b
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   604
  ! bar
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   605
  ? c
e74704c33e24 strip: make --keep option not set all dirstate times to 0
Durham Goode <durham@fb.com>
parents: 18371
diff changeset
   606
  ? d
27177
e76b27a642ca strip: add a --keep test related to removing files from dirstate
Christian Delahousse <cdelahousse@fb.com>
parents: 27030
diff changeset
   607
e76b27a642ca strip: add a --keep test related to removing files from dirstate
Christian Delahousse <cdelahousse@fb.com>
parents: 27030
diff changeset
   608
... after updating the dirstate
e76b27a642ca strip: add a --keep test related to removing files from dirstate
Christian Delahousse <cdelahousse@fb.com>
parents: 27030
diff changeset
   609
  $ hg add c
e76b27a642ca strip: add a --keep test related to removing files from dirstate
Christian Delahousse <cdelahousse@fb.com>
parents: 27030
diff changeset
   610
  $ hg commit -mc
e76b27a642ca strip: add a --keep test related to removing files from dirstate
Christian Delahousse <cdelahousse@fb.com>
parents: 27030
diff changeset
   611
  $ hg rm c
e76b27a642ca strip: add a --keep test related to removing files from dirstate
Christian Delahousse <cdelahousse@fb.com>
parents: 27030
diff changeset
   612
  $ hg commit -mc
e76b27a642ca strip: add a --keep test related to removing files from dirstate
Christian Delahousse <cdelahousse@fb.com>
parents: 27030
diff changeset
   613
  $ hg strip --keep '.^' -q
16252
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
   614
  $ cd ..
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
   615
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
   616
stripping many nodes on a complex graph (issue3299)
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
   617
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
   618
  $ hg init issue3299
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
   619
  $ cd issue3299
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
   620
  $ hg debugbuilddag '@a.:a@b.:b.:x<a@a.:a<b@b.:b<a@a.:a'
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
   621
  $ hg strip 'not ancestors(x)'
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
   622
  saved backup bundle to $TESTTMP/issue3299/.hg/strip-backup/*-backup.hg (glob)
cf17e76be4dd strip: enhance repair.strip to receive a list of nodes (issue3299)
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 13572
diff changeset
   623
16718
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   624
test hg strip -B bookmark
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   625
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   626
  $ cd ..
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   627
  $ hg init bookmarks
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   628
  $ cd bookmarks
27030
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   629
  $ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b<m+2:d<2.:e<m+1:f'
16718
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   630
  $ hg bookmark -r 'a' 'todelete'
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   631
  $ hg bookmark -r 'b' 'B'
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   632
  $ hg bookmark -r 'b' 'nostrip'
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   633
  $ hg bookmark -r 'c' 'delete'
27030
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   634
  $ hg bookmark -r 'd' 'multipledelete1'
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   635
  $ hg bookmark -r 'e' 'multipledelete2'
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   636
  $ hg bookmark -r 'f' 'singlenode1'
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   637
  $ hg bookmark -r 'f' 'singlenode2'
16718
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   638
  $ hg up -C todelete
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   639
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
21503
10f15e34d86c update: show message when a bookmark is activated by update
Stephen Lee <sphen.lee@gmail.com>
parents: 20885
diff changeset
   640
  (activating bookmark todelete)
16718
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   641
  $ hg strip -B nostrip
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   642
  bookmark 'nostrip' deleted
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   643
  abort: empty revision set
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   644
  [255]
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   645
  $ hg strip -B todelete
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   646
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   647
  saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
21847
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
   648
  bookmark 'todelete' deleted
16718
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   649
  $ hg id -ir dcbb326fdec2
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   650
  abort: unknown revision 'dcbb326fdec2'!
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   651
  [255]
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   652
  $ hg id -ir d62d843c9a01
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   653
  d62d843c9a01
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   654
  $ hg bookmarks
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   655
     B                         9:ff43616e5d0f
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   656
     delete                    6:2702dd0c91e7
27030
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   657
     multipledelete1           11:e46a4836065c
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   658
     multipledelete2           12:b4594d867745
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   659
     singlenode1               13:43227190fef8
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   660
     singlenode2               13:43227190fef8
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   661
  $ hg strip -B multipledelete1 -B multipledelete2
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
   662
  saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/e46a4836065c-89ec65c2-backup.hg
27030
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   663
  bookmark 'multipledelete1' deleted
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   664
  bookmark 'multipledelete2' deleted
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   665
  $ hg id -ir e46a4836065c
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   666
  abort: unknown revision 'e46a4836065c'!
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   667
  [255]
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   668
  $ hg id -ir b4594d867745
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   669
  abort: unknown revision 'b4594d867745'!
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   670
  [255]
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   671
  $ hg strip -B singlenode1 -B singlenode2
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
   672
  saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/43227190fef8-8da858f2-backup.hg
27030
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   673
  bookmark 'singlenode1' deleted
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   674
  bookmark 'singlenode2' deleted
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   675
  $ hg id -ir 43227190fef8
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   676
  abort: unknown revision '43227190fef8'!
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   677
  [255]
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   678
  $ hg strip -B unknownbookmark
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   679
  abort: bookmark 'unknownbookmark' not found
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   680
  [255]
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   681
  $ hg strip -B unknownbookmark1 -B unknownbookmark2
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   682
  abort: bookmark 'unknownbookmark1,unknownbookmark2' not found
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   683
  [255]
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   684
  $ hg strip -B delete -B unknownbookmark
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   685
  abort: bookmark 'unknownbookmark' not found
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   686
  [255]
16718
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   687
  $ hg strip -B delete
21847
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
   688
  saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
16829
6403fdd716fe strip: move bookmark deletion before strip to deal with filecache invalidation
Matt Mackall <mpm@selenic.com>
parents: 16718
diff changeset
   689
  bookmark 'delete' deleted
16718
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   690
  $ hg id -ir 6:2702dd0c91e7
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   691
  abort: unknown revision '2702dd0c91e7'!
3290e24bb3f0 strip: introduce -B option to remove a bookmark
David Soria Parra <dsp@php.net>
parents: 16252
diff changeset
   692
  [255]
21847
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
   693
  $ hg update B
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
   694
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
   695
  (activating bookmark B)
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
   696
  $ echo a > a
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
   697
  $ hg add a
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
   698
  $ hg strip -B B
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
   699
  abort: local changes found
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
   700
  [255]
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
   701
  $ hg bookmarks
f6f122f4813b strip: remove bookmarks after strip succeed (issue4295)
David Soria Parra <davidsp@fb.com>
parents: 21503
diff changeset
   702
   * B                         6:ff43616e5d0f
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16829
diff changeset
   703
21854
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
   704
Make sure no one adds back a -b option:
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
   705
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
   706
  $ hg strip -b tip
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
   707
  hg strip: option -b not recognized
28288
e417e4512b0f doc: remove deprecated option from synopsis of command help
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 27177
diff changeset
   708
  hg strip [-k] [-f] [-B bookmark] [-r] REV...
21854
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
   709
  
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
   710
  strip changesets and all their descendants from the repository
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
   711
  
29974
7109d5ddeb0c help: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 29954
diff changeset
   712
  (use 'hg help -e strip' to show help for the strip extension)
21854
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
   713
  
22117
c1d93edcf004 help: fold repeatable option message into option table header
Matt Mackall <mpm@selenic.com>
parents: 22112
diff changeset
   714
  options ([+] can be repeated):
21854
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
   715
  
27030
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   716
   -r --rev REV [+]        strip specified revision (optional, can specify
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   717
                           revisions without this option)
30152
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   718
   -f --force              force removal of changesets, discard uncommitted
27030
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   719
                           changes (no backup)
30152
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   720
      --no-backup          no backups
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   721
   -k --keep               do not modify working directory during strip
27030
cf9ed6d32ccb strip: changing bookmark argument to be a list
Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com>
parents: 26929
diff changeset
   722
   -B --bookmark VALUE [+] remove revs only reachable from given bookmark
30152
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   723
      --mq                 operate on patch repository
21854
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
   724
  
29974
7109d5ddeb0c help: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 29954
diff changeset
   725
  (use 'hg strip -h' to show more help)
21854
ba3bc6474bbf strip: drop -b/--backup option (BC)
Matt Mackall <mpm@selenic.com>
parents: 21847
diff changeset
   726
  [255]
23835
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   727
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   728
  $ cd ..
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   729
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   730
Verify bundles don't get overwritten:
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   731
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   732
  $ hg init doublebundle
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   733
  $ cd doublebundle
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   734
  $ touch a
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   735
  $ hg commit -Aqm a
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   736
  $ touch b
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   737
  $ hg commit -Aqm b
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   738
  $ hg strip -r 0
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   739
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
   740
  saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg
23835
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   741
  $ ls .hg/strip-backup
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   742
  3903775176ed-e68910bd-backup.hg
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   743
  $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   744
  $ hg strip -r 0
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
   745
  saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg
23835
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   746
  $ ls .hg/strip-backup
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   747
  3903775176ed-54390173-backup.hg
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 22117
diff changeset
   748
  3903775176ed-e68910bd-backup.hg
25677
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   749
  $ cd ..
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   750
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   751
Test that we only bundle the stripped changesets (issue4736)
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   752
------------------------------------------------------------
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   753
26173
0f14c40a05c4 test-strip: fix spelling of initialization (en-US)
timeless@mozdev.org
parents: 26012
diff changeset
   754
initialization (previous repo is empty anyway)
25677
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   755
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   756
  $ hg init issue4736
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   757
  $ cd issue4736
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   758
  $ echo a > a
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   759
  $ hg add a
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   760
  $ hg commit -m commitA
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   761
  $ echo b > b
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   762
  $ hg add b
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   763
  $ hg commit -m commitB
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   764
  $ echo c > c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   765
  $ hg add c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   766
  $ hg commit -m commitC
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   767
  $ hg up 'desc(commitB)'
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   768
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   769
  $ echo d > d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   770
  $ hg add d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   771
  $ hg commit -m commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   772
  created new head
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   773
  $ hg up 'desc(commitC)'
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   774
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   775
  $ hg merge 'desc(commitD)'
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   776
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   777
  (branch merge, don't forget to commit)
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   778
  $ hg ci -m 'mergeCD'
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   779
  $ hg log -G
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   780
  @    changeset:   4:d8db9d137221
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   781
  |\   tag:         tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   782
  | |  parent:      2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   783
  | |  parent:      3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   784
  | |  user:        test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   785
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   786
  | |  summary:     mergeCD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   787
  | |
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   788
  | o  changeset:   3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   789
  | |  parent:      1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   790
  | |  user:        test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   791
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   792
  | |  summary:     commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   793
  | |
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   794
  o |  changeset:   2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   795
  |/   user:        test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   796
  |    date:        Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   797
  |    summary:     commitC
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   798
  |
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   799
  o  changeset:   1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   800
  |  user:        test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   801
  |  date:        Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   802
  |  summary:     commitB
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   803
  |
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   804
  o  changeset:   0:105141ef12d0
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   805
     user:        test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   806
     date:        Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   807
     summary:     commitA
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   808
  
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   809
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   810
Check bundle behavior:
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   811
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   812
  $ hg bundle -r 'desc(mergeCD)' --base 'desc(commitC)' ../issue4736.hg
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   813
  2 changesets found
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   814
  $ hg log -r 'bundle()' -R ../issue4736.hg
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   815
  changeset:   3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   816
  parent:      1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   817
  user:        test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   818
  date:        Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   819
  summary:     commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   820
  
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   821
  changeset:   4:d8db9d137221
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   822
  tag:         tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   823
  parent:      2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   824
  parent:      3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   825
  user:        test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   826
  date:        Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   827
  summary:     mergeCD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   828
  
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   829
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   830
check strip behavior
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   831
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   832
  $ hg --config extensions.strip= strip 'desc(commitD)' --debug
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   833
  resolving manifests
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   834
   branchmerge: False, force: True, partial: False
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   835
   ancestor: d8db9d137221+, local: d8db9d137221+, remote: eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   836
   c: other deleted -> r
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   837
  removing c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   838
   d: other deleted -> r
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   839
  removing d
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 28029
diff changeset
   840
  starting 4 threads for background file closing (?)
25677
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   841
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   842
  2 changesets found
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   843
  list of changesets:
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   844
  6625a516847449b6f0fa3737b9ba56e9f0f3032c
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   845
  d8db9d1372214336d2b5570f20ee468d2c72fa8b
33032
8e3021fd1a44 strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 32698
diff changeset
   846
  bundle2-output-bundle: "HG20", (1 params) 2 parts total
29593
953839de96ab bundle2: store changeset count when creating file bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29592
diff changeset
   847
  bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
33032
8e3021fd1a44 strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 32698
diff changeset
   848
  bundle2-output-part: "phase-heads" 24 bytes payload
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
   849
  saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg
32267
c2380b448265 caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30152
diff changeset
   850
  updating the branch cache
25677
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   851
  invalid branchheads cache (served): tip differs
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   852
  truncating cache/rbc-revs-v1 to 24
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   853
  $ hg log -G
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   854
  o  changeset:   2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   855
  |  tag:         tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   856
  |  user:        test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   857
  |  date:        Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   858
  |  summary:     commitC
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   859
  |
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   860
  @  changeset:   1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   861
  |  user:        test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   862
  |  date:        Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   863
  |  summary:     commitB
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   864
  |
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   865
  o  changeset:   0:105141ef12d0
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   866
     user:        test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   867
     date:        Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   868
     summary:     commitA
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   869
  
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   870
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   871
strip backup content
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   872
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   873
  $ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   874
  changeset:   3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   875
  parent:      1:eca11cf91c71
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   876
  user:        test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   877
  date:        Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   878
  summary:     commitD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   879
  
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   880
  changeset:   4:d8db9d137221
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   881
  tag:         tip
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   882
  parent:      2:5c51d8d6557d
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   883
  parent:      3:6625a5168474
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   884
  user:        test
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   885
  date:        Thu Jan 01 00:00:00 1970 +0000
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   886
  summary:     mergeCD
af5b2f4ed594 changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24709
diff changeset
   887
  
29196
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   888
Check that the phase cache is properly invalidated after a strip with bookmark.
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   889
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   890
  $ cat > ../stripstalephasecache.py << EOF
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   891
  > from mercurial import extensions, localrepo
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   892
  > def transactioncallback(orig, repo, desc, *args, **kwargs):
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   893
  >     def test(transaction):
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   894
  >         # observe cache inconsistency
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   895
  >         try:
35830
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
   896
  >             [repo.changelog.node(r) for r in repo.revs(b"not public()")]
29196
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   897
  >         except IndexError:
35830
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
   898
  >             repo.ui.status(b"Index error!\n")
29196
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   899
  >     transaction = orig(repo, desc, *args, **kwargs)
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   900
  >     # warm up the phase cache
35830
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
   901
  >     list(repo.revs(b"not public()"))
35846
c4c1e3334bcb tests: fix a missed b prefix in a test extension in test-strip.t
Augie Fackler <augie@google.com>
parents: 35830
diff changeset
   902
  >     if desc != b'strip':
35830
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
   903
  >          transaction.addpostclose(b"phase invalidation test", test)
29196
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   904
  >     return transaction
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   905
  > def extsetup(ui):
35830
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
   906
  >     extensions.wrapfunction(localrepo.localrepository, b"transaction",
29196
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   907
  >                             transactioncallback)
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   908
  > EOF
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   909
  $ hg up -C 2
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   910
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   911
  $ echo k > k
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   912
  $ hg add k
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   913
  $ hg commit -m commitK
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   914
  $ echo l > l
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   915
  $ hg add l
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   916
  $ hg commit -m commitL
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   917
  $ hg book -r tip blah
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   918
  $ hg strip ".^" --config extensions.crash=$TESTTMP/stripstalephasecache.py
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   919
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
   920
  saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/8f0b4384875c-4fa10deb-backup.hg
29196
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   921
  $ hg up -C 1
bf7b8157c483 strip: invalidate phase cache after stripping changeset (issue5235)
Laurent Charignon <lcharignon@fb.com>
parents: 28324
diff changeset
   922
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
26012
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   923
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   924
Error during post-close callback of the strip transaction
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   925
(They should be gracefully handled and reported)
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   926
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   927
  $ cat > ../crashstrip.py << EOF
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   928
  > from mercurial import error
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   929
  > def reposetup(ui, repo):
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   930
  >     class crashstriprepo(repo.__class__):
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   931
  >         def transaction(self, desc, *args, **kwargs):
33540
e07c5740eaaa test-strip: fix call to super class in crashstriprepo
Boris Feld <boris.feld@octobus.net>
parents: 33331
diff changeset
   932
  >             tr = super(crashstriprepo, self).transaction(desc, *args, **kwargs)
35830
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
   933
  >             if desc == b'strip':
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
   934
  >                 def crash(tra): raise error.Abort(b'boom')
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
   935
  >                 tr.addpostclose(b'crash', crash)
26012
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   936
  >             return tr
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   937
  >     repo.__class__ = crashstriprepo
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   938
  > EOF
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   939
  $ hg strip tip --config extensions.crash=$TESTTMP/crashstrip.py
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
   940
  saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
   941
  strip failed, backup bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg'
26012
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   942
  abort: boom
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   943
  [255]
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
   944
34621
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   945
test stripping a working directory parent doesn't switch named branches
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   946
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   947
  $ hg log -G
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   948
  @  changeset:   1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   949
  |  tag:         tip
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   950
  |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   951
  |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   952
  |  summary:     commitB
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   953
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   954
  o  changeset:   0:105141ef12d0
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   955
     user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   956
     date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   957
     summary:     commitA
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   958
  
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   959
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   960
  $ hg branch new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   961
  marked working directory as branch new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   962
  (branches are permanent and global, did you want a bookmark?)
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   963
  $ hg ci -m "start new branch"
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   964
  $ echo 'foo' > foo.txt
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   965
  $ hg ci -Aqm foo
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   966
  $ hg up default
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   967
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   968
  $ echo 'bar' > bar.txt
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   969
  $ hg ci -Aqm bar
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   970
  $ hg up new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   971
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   972
  $ hg merge default
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   973
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   974
  (branch merge, don't forget to commit)
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   975
  $ hg log -G
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   976
  @  changeset:   4:35358f982181
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   977
  |  tag:         tip
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   978
  |  parent:      1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   979
  |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   980
  |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   981
  |  summary:     bar
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   982
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   983
  | @  changeset:   3:f62c6c09b707
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   984
  | |  branch:      new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   985
  | |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   986
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   987
  | |  summary:     foo
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   988
  | |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   989
  | o  changeset:   2:b1d33a8cadd9
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   990
  |/   branch:      new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   991
  |    user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   992
  |    date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   993
  |    summary:     start new branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   994
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   995
  o  changeset:   1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   996
  |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   997
  |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   998
  |  summary:     commitB
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
   999
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1000
  o  changeset:   0:105141ef12d0
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1001
     user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1002
     date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1003
     summary:     commitA
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1004
  
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1005
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1006
  $ hg strip --force -r 35358f982181
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1007
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
  1008
  saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-50d992d4-backup.hg
34621
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1009
  $ hg log -G
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1010
  @  changeset:   3:f62c6c09b707
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1011
  |  branch:      new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1012
  |  tag:         tip
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1013
  |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1014
  |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1015
  |  summary:     foo
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1016
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1017
  o  changeset:   2:b1d33a8cadd9
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1018
  |  branch:      new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1019
  |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1020
  |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1021
  |  summary:     start new branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1022
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1023
  o  changeset:   1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1024
  |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1025
  |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1026
  |  summary:     commitB
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1027
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1028
  o  changeset:   0:105141ef12d0
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1029
     user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1030
     date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1031
     summary:     commitA
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1032
  
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1033
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1034
  $ hg up default
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1035
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1036
  $ echo 'bar' > bar.txt
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1037
  $ hg ci -Aqm bar
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1038
  $ hg up new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1039
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1040
  $ hg merge default
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1041
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1042
  (branch merge, don't forget to commit)
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1043
  $ hg ci -m merge
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1044
  $ hg log -G
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1045
  @    changeset:   5:4cf5e92caec2
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1046
  |\   branch:      new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1047
  | |  tag:         tip
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1048
  | |  parent:      3:f62c6c09b707
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1049
  | |  parent:      4:35358f982181
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1050
  | |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1051
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1052
  | |  summary:     merge
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1053
  | |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1054
  | o  changeset:   4:35358f982181
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1055
  | |  parent:      1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1056
  | |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1057
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1058
  | |  summary:     bar
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1059
  | |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1060
  o |  changeset:   3:f62c6c09b707
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1061
  | |  branch:      new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1062
  | |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1063
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1064
  | |  summary:     foo
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1065
  | |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1066
  o |  changeset:   2:b1d33a8cadd9
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1067
  |/   branch:      new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1068
  |    user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1069
  |    date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1070
  |    summary:     start new branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1071
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1072
  o  changeset:   1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1073
  |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1074
  |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1075
  |  summary:     commitB
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1076
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1077
  o  changeset:   0:105141ef12d0
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1078
     user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1079
     date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1080
     summary:     commitA
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1081
  
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1082
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1083
  $ hg strip -r 35358f982181
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1084
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
  1085
  saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
34621
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1086
  $ hg log -G
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1087
  @  changeset:   3:f62c6c09b707
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1088
  |  branch:      new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1089
  |  tag:         tip
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1090
  |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1091
  |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1092
  |  summary:     foo
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1093
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1094
  o  changeset:   2:b1d33a8cadd9
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1095
  |  branch:      new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1096
  |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1097
  |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1098
  |  summary:     start new branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1099
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1100
  o  changeset:   1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1101
  |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1102
  |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1103
  |  summary:     commitB
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1104
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1105
  o  changeset:   0:105141ef12d0
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1106
     user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1107
     date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1108
     summary:     commitA
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1109
  
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1110
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1111
  $ hg pull -u $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
  1112
  pulling from $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
34621
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1113
  searching for changes
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1114
  adding changesets
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1115
  adding manifests
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1116
  adding file changes
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1117
  added 2 changesets with 1 changes to 1 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34621
diff changeset
  1118
  new changesets 35358f982181:4cf5e92caec2
34621
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1119
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1120
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1121
  $ hg strip -k -r 35358f982181
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
  1122
  saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
34621
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1123
  $ hg log -G
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1124
  @  changeset:   3:f62c6c09b707
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1125
  |  branch:      new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1126
  |  tag:         tip
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1127
  |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1128
  |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1129
  |  summary:     foo
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1130
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1131
  o  changeset:   2:b1d33a8cadd9
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1132
  |  branch:      new-branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1133
  |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1134
  |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1135
  |  summary:     start new branch
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1136
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1137
  o  changeset:   1:eca11cf91c71
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1138
  |  user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1139
  |  date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1140
  |  summary:     commitB
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1141
  |
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1142
  o  changeset:   0:105141ef12d0
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1143
     user:        test
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1144
     date:        Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1145
     summary:     commitA
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1146
  
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1147
  $ hg diff
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1148
  diff -r f62c6c09b707 bar.txt
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1149
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1150
  +++ b/bar.txt	Thu Jan 01 00:00:00 1970 +0000
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1151
  @@ -0,0 +1,1 @@
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1152
  +bar
5613fb1583d6 strip: take branch into account when selecting update target (issue5540)
Paul Morelle <paul.morelle@octobus.net>
parents: 34453
diff changeset
  1153
33087
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1154
Use delayedstrip to strip inside a transaction
26012
d815a5997576 strip: use the 'finally: tr.release' pattern during stripping
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25695
diff changeset
  1155
33087
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1156
  $ cd $TESTTMP
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1157
  $ hg init delayedstrip
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1158
  $ cd delayedstrip
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1159
  $ hg debugdrawdag <<'EOS'
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1160
  >   D
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1161
  >   |
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1162
  >   C F H    # Commit on top of "I",
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1163
  >   | |/|    # Strip B+D+I+E+G+H+Z
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1164
  > I B E G
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1165
  >  \|/
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1166
  >   A   Z
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1167
  > EOS
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1168
  $ cp -R . ../scmutilcleanup
33087
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1169
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1170
  $ hg up -C I
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1171
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1172
  $ echo 3 >> I
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1173
  $ cat > $TESTTMP/delayedstrip.py <<EOF
33987
ed88f90bb787 tests: update test-strip to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33773
diff changeset
  1174
  > from __future__ import absolute_import
34453
40b6d25ed2d5 test-strip: make test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 34286
diff changeset
  1175
  > from mercurial import commands, registrar, repair
40b6d25ed2d5 test-strip: make test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 34286
diff changeset
  1176
  > cmdtable = {}
40b6d25ed2d5 test-strip: make test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 34286
diff changeset
  1177
  > command = registrar.command(cmdtable)
35830
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
  1178
  > @command(b'testdelayedstrip')
34453
40b6d25ed2d5 test-strip: make test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 34286
diff changeset
  1179
  > def testdelayedstrip(ui, repo):
33087
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1180
  >     def getnodes(expr):
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1181
  >         return [repo.changelog.node(r) for r in repo.revs(expr)]
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1182
  >     with repo.wlock():
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1183
  >         with repo.lock():
35830
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
  1184
  >             with repo.transaction(b'delayedstrip'):
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
  1185
  >                 repair.delayedstrip(ui, repo, getnodes(b'B+I+Z+D+E'), b'J')
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
  1186
  >                 repair.delayedstrip(ui, repo, getnodes(b'G+H+Z'), b'I')
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
  1187
  >                 commands.commit(ui, repo, message=b'J', date=b'0 0')
33087
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1188
  > EOF
34453
40b6d25ed2d5 test-strip: make test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 34286
diff changeset
  1189
  $ hg testdelayedstrip --config extensions.t=$TESTTMP/delayedstrip.py
33087
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1190
  warning: orphaned descendants detected, not stripping 08ebfeb61bac, 112478962961, 7fb047a69f22
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
  1191
  saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-17475721-I.hg
34453
40b6d25ed2d5 test-strip: make test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 34286
diff changeset
  1192
33087
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1193
  $ hg log -G -T '{rev}:{node|short} {desc}' -r 'sort(all(), topo)'
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1194
  @  6:2f2d51af6205 J
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1195
  |
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1196
  o  3:08ebfeb61bac I
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1197
  |
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1198
  | o  5:64a8289d2492 F
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1199
  | |
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1200
  | o  2:7fb047a69f22 E
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1201
  |/
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1202
  | o  4:26805aba1e60 C
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1203
  | |
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1204
  | o  1:112478962961 B
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1205
  |/
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1206
  o  0:426bada5c675 A
fcd1c483f5ea strip: add a delayedstrip method that works in a transaction
Jun Wu <quark@fb.com>
parents: 33032
diff changeset
  1207
  
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1208
Test high-level scmutil.cleanupnodes API
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1209
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1210
  $ cd $TESTTMP/scmutilcleanup
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1211
  $ hg debugdrawdag <<'EOS'
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1212
  >   D2  F2  G2   # D2, F2, G2 are replacements for D, F, G
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1213
  >   |   |   |
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1214
  >   C   H   G
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1215
  > EOS
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1216
  $ for i in B C D F G I Z; do
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1217
  >     hg bookmark -i -r $i b-$i
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1218
  > done
33331
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks
Jun Wu <quark@fb.com>
parents: 33088
diff changeset
  1219
  $ hg bookmark -i -r E 'b-F@divergent1'
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks
Jun Wu <quark@fb.com>
parents: 33088
diff changeset
  1220
  $ hg bookmark -i -r H 'b-F@divergent2'
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks
Jun Wu <quark@fb.com>
parents: 33088
diff changeset
  1221
  $ hg bookmark -i -r G 'b-F@divergent3'
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1222
  $ cp -R . ../scmutilcleanup.obsstore
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1223
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1224
  $ cat > $TESTTMP/scmutilcleanup.py <<EOF
34453
40b6d25ed2d5 test-strip: make test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 34286
diff changeset
  1225
  > from mercurial import registrar, scmutil
40b6d25ed2d5 test-strip: make test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 34286
diff changeset
  1226
  > cmdtable = {}
40b6d25ed2d5 test-strip: make test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 34286
diff changeset
  1227
  > command = registrar.command(cmdtable)
35830
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
  1228
  > @command(b'testnodescleanup')
34453
40b6d25ed2d5 test-strip: make test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 34286
diff changeset
  1229
  > def testnodescleanup(ui, repo):
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1230
  >     def nodes(expr):
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1231
  >         return [repo.changelog.node(r) for r in repo.revs(expr)]
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1232
  >     def node(expr):
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1233
  >         return nodes(expr)[0]
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1234
  >     with repo.wlock():
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1235
  >         with repo.lock():
35830
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
  1236
  >             with repo.transaction(b'delayedstrip'):
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
  1237
  >                 mapping = {node(b'F'): [node(b'F2')],
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
  1238
  >                            node(b'D'): [node(b'D2')],
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
  1239
  >                            node(b'G'): [node(b'G2')]}
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
  1240
  >                 scmutil.cleanupnodes(repo, mapping, b'replace')
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
  1241
  >                 scmutil.cleanupnodes(repo, nodes(b'((B::)+I+Z)-D2'),
e689d8b22728 tests: bytestring-ify all the adhoc extensions in test-strip.t
Augie Fackler <augie@google.com>
parents: 35709
diff changeset
  1242
  >                                      b'replace')
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1243
  > EOF
34453
40b6d25ed2d5 test-strip: make test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 34286
diff changeset
  1244
  $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1245
  warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
  1246
  saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg
34453
40b6d25ed2d5 test-strip: make test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 34286
diff changeset
  1247
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1248
  $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
33331
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks
Jun Wu <quark@fb.com>
parents: 33088
diff changeset
  1249
  o  8:1473d4b996d1 G2 b-F@divergent3 b-G
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1250
  |
33558
0103e7187237 drawdag: include files from both parents in merge commits
Martin von Zweigbergk <martinvonz@google.com>
parents: 33540
diff changeset
  1251
  | o  7:d11b3456a873 F2 b-F
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1252
  | |
33558
0103e7187237 drawdag: include files from both parents in merge commits
Martin von Zweigbergk <martinvonz@google.com>
parents: 33540
diff changeset
  1253
  | o  5:5cb05ba470a7 H
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1254
  |/|
33331
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks
Jun Wu <quark@fb.com>
parents: 33088
diff changeset
  1255
  | o  3:7fb047a69f22 E b-F@divergent1
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1256
  | |
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1257
  | | o  6:7c78f703e465 D2 b-D
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1258
  | | |
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1259
  | | o  4:26805aba1e60 C
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1260
  | | |
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1261
  | | o  2:112478962961 B
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1262
  | |/
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1263
  o |  1:1fc8102cda62 G
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1264
   /
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1265
  o  0:426bada5c675 A b-B b-C b-I
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1266
  
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1267
  $ hg bookmark
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1268
     b-B                       0:426bada5c675
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1269
     b-C                       0:426bada5c675
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1270
     b-D                       6:7c78f703e465
33558
0103e7187237 drawdag: include files from both parents in merge commits
Martin von Zweigbergk <martinvonz@google.com>
parents: 33540
diff changeset
  1271
     b-F                       7:d11b3456a873
33331
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks
Jun Wu <quark@fb.com>
parents: 33088
diff changeset
  1272
     b-F@divergent1            3:7fb047a69f22
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks
Jun Wu <quark@fb.com>
parents: 33088
diff changeset
  1273
     b-F@divergent3            8:1473d4b996d1
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1274
     b-G                       8:1473d4b996d1
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1275
     b-I                       0:426bada5c675
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1276
     b-Z                       -1:000000000000
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1277
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1278
Test the above using obsstore "by the way". Not directly related to strip, but
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1279
we have reusable code here
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1280
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1281
  $ cd $TESTTMP/scmutilcleanup.obsstore
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1282
  $ cat >> .hg/hgrc <<EOF
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1283
  > [experimental]
34865
a0100f34e20b config: replace experimental.stabilization by experimental.evolution
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
  1284
  > evolution=true
34870
64f29fff1877 config: rename stabilization.track-operation
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
  1285
  > evolution.track-operation=1
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1286
  > EOF
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1287
34453
40b6d25ed2d5 test-strip: make test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 34286
diff changeset
  1288
  $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
35709
1a09dad8b85a evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 35508
diff changeset
  1289
  4 new orphan changesets
34453
40b6d25ed2d5 test-strip: make test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 34286
diff changeset
  1290
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1291
  $ rm .hg/localtags
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1292
  $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
  1293
  *  12:1473d4b996d1 G2 b-F@divergent3 b-G
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1294
  |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
  1295
  | *  11:d11b3456a873 F2 b-F
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1296
  | |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
  1297
  | *  8:5cb05ba470a7 H
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1298
  |/|
33331
4bae3c117b57 scmutil: make cleanupnodes delete divergent bookmarks
Jun Wu <quark@fb.com>
parents: 33088
diff changeset
  1299
  | o  4:7fb047a69f22 E b-F@divergent1
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1300
  | |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
  1301
  | | *  10:7c78f703e465 D2 b-D
33088
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1302
  | | |
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1303
  | | x  6:26805aba1e60 C
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1304
  | | |
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1305
  | | x  3:112478962961 B
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1306
  | |/
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1307
  x |  1:1fc8102cda62 G
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1308
   /
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1309
  o  0:426bada5c675 A b-B b-C b-I
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1310
  
65cadeea6c22 scmutil: add a cleanupnodes method for developers
Jun Wu <quark@fb.com>
parents: 33087
diff changeset
  1311
  $ hg debugobsolete
34961
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34870
diff changeset
  1312
  1fc8102cda6204549f031015641606ccf5513ec3 1473d4b996d1d1b121de6b39fab6a04fbf9d873e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'replace', 'user': 'test'}
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34870
diff changeset
  1313
  64a8289d249234b9886244d379f15e6b650b28e3 d11b3456a873daec7c7bc53e5622e8df6d741bd2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'replace', 'user': 'test'}
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34870
diff changeset
  1314
  f585351a92f85104bff7c284233c338b10eb1df7 7c78f703e465d73102cc8780667ce269c5208a40 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'replace', 'user': 'test'}
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34870
diff changeset
  1315
  48b9aae0607f43ff110d84e6883c151942add5ab 0 {0000000000000000000000000000000000000000} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'replace', 'user': 'test'}
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34870
diff changeset
  1316
  112478962961147124edd43549aedd1a335e44bf 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'replace', 'user': 'test'}
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34870
diff changeset
  1317
  08ebfeb61bac6e3f12079de774d285a0d6689eba 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'replace', 'user': 'test'}
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34870
diff changeset
  1318
  26805aba1e600a82e93661149f2313866a221a7b 0 {112478962961147124edd43549aedd1a335e44bf} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'replace', 'user': 'test'}
34143
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1319
  $ cd ..
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1320
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1321
Test that obsmarkers are restored even when not using generaldelta
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1322
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1323
  $ hg --config format.usegeneraldelta=no init issue5678
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1324
  $ cd issue5678
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1325
  $ cat >> .hg/hgrc <<EOF
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1326
  > [experimental]
34865
a0100f34e20b config: replace experimental.stabilization by experimental.evolution
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
  1327
  > evolution=true
34143
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1328
  > EOF
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1329
  $ echo a > a
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1330
  $ hg ci -Aqm a
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1331
  $ hg ci --amend -m a2
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1332
  $ hg debugobsolete
34961
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34870
diff changeset
  1333
  cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
34143
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1334
  $ hg strip .
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1335
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34961
diff changeset
  1336
  saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg
34143
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1337
  $ hg unbundle -q .hg/strip-backup/*
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1338
  $ hg debugobsolete
34961
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34870
diff changeset
  1339
  cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
34143
b5d7e7d5c573 tests: add test for issue5678
Martin von Zweigbergk <martinvonz@google.com>
parents: 33558
diff changeset
  1340
  $ cd ..