tests/test-qsync.t
author Pierre-Yves David <pierre-yves.david@logilab.fr>
Thu, 26 Jul 2012 11:44:05 +0200
changeset 380 b36b07ae21bc
parent 343 6b92f8d5ae58
child 486 2111c655b4f5
permissions -rw-r--r--
[temp] fix obsolete marker cloning broken in core.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
220
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
     1
  $ cat >> $HGRCPATH <<EOF
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
     2
  > [defaults]
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
     3
  > amend=-d "0 0"
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
     4
  > [web]
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
     5
  > push_ssl = false
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
     6
  > allow_push = *
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
     7
  > [phases]
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
     8
  > publish = False
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
     9
  > [alias]
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    10
  > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n'
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    11
  > mqlog = log --mq --template='{rev} - {desc}\n'
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    12
  > [diff]
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    13
  > git = 1
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    14
  > unified = 0
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    15
  > [extensions]
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    16
  > hgext.rebase=
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    17
  > hgext.graphlog=
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    18
  > hgext.mq=
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    19
  > EOF
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    20
  $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    21
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    22
  $ echo "qsync=$(echo $(dirname $TESTDIR))/hgext/qsync.py" >> $HGRCPATH
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    23
  $ mkcommit() {
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    24
  >    echo "$1" > "$1"
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    25
  >    hg add "$1"
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    26
  >    hg ci -m "add $1"
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    27
  > }
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    28
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    29
basic sync
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    30
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    31
  $ hg init local
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    32
  $ cd local
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    33
  $ hg qinit -c
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    34
  $ hg qci -m "initial commit"
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    35
  $ mkcommit a
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    36
  $ mkcommit b
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    37
  $ hg qlog
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    38
  1 - 7c3bad9141dc add b (draft)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    39
  0 - 1f0dee641bb7 add a (draft)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    40
  $ hg qsync -a
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    41
  $ hg mqlog
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    42
  2 - qsubmit commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    43
  
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    44
  * DEFAULT-add_a.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    45
  * DEFAULT-add_b.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    46
  1 - qsubmit init
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    47
  0 - initial commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    48
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    49
basic sync II
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    50
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    51
  $ hg init local
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    52
  $ cd local
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    53
  $ hg qinit -c
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    54
  $ hg qci -m "initial commit"
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    55
  $ mkcommit a
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    56
  $ mkcommit b
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    57
  $ hg qlog
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    58
  1 - 7c3bad9141dc add b (draft)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    59
  0 - 1f0dee641bb7 add a (draft)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    60
  $ hg qsync -a
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    61
  $ hg mqlog
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    62
  2 - qsubmit commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    63
  
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    64
  * DEFAULT-add_a.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    65
  * DEFAULT-add_b.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    66
  1 - qsubmit init
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    67
  0 - initial commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    68
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    69
  $ echo "b" >> b
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    70
  $ hg amend
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    71
  $ hg qsync -a
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    72
  $ hg mqlog
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    73
  3 - qsubmit commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    74
  
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    75
  * DEFAULT-add_b.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    76
  2 - qsubmit commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    77
  
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    78
  * DEFAULT-add_a.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    79
  * DEFAULT-add_b.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    80
  1 - qsubmit init
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    81
  0 - initial commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    82
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    83
  $ hg up -r 0
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    84
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    85
  $ echo "a" >> a
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    86
  $ hg amend
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    87
  1 new unstables changesets
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    88
  $ hg graft -O 3
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    89
  grafting revision 3
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    90
  $ hg qsync -a
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    91
  $ hg mqlog
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    92
  4 - qsubmit commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    93
  
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    94
  * DEFAULT-add_a.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    95
  * DEFAULT-add_b.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    96
  3 - qsubmit commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    97
  
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    98
  * DEFAULT-add_b.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
    99
  2 - qsubmit commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   100
  
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   101
  * DEFAULT-add_a.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   102
  * DEFAULT-add_b.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   103
  1 - qsubmit init
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   104
  0 - initial commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   105
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   106
sync with published changeset
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   107
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   108
  $ hg init local
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   109
  $ cd local
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   110
  $ hg qinit -c
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   111
  $ hg qci -m "initial commit"
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   112
  $ mkcommit a
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   113
  $ mkcommit b
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   114
  $ hg qlog
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   115
  1 - 7c3bad9141dc add b (draft)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   116
  0 - 1f0dee641bb7 add a (draft)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   117
  $ hg qsync -a
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   118
  $ hg mqlog
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   119
  2 - qsubmit commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   120
  
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   121
  * DEFAULT-add_a.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   122
  * DEFAULT-add_b.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   123
  1 - qsubmit init
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   124
  0 - initial commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   125
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   126
  $ hg phase -p 0
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   127
  $ hg qsync -a
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   128
  $ hg mqlog
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   129
  3 - qsubmit commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   130
  
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   131
  * applied DEFAULT-add_a.diff
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   132
  2 - qsubmit commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   133
  
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   134
  * DEFAULT-add_a.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   135
  * DEFAULT-add_b.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   136
  1 - qsubmit init
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   137
  0 - initial commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   138
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   139
  $ mkcommit c
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   140
  $ mkcommit d
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   141
  $ hg qsync -a
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   142
  $ hg mqlog
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   143
  4 - qsubmit commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   144
  
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   145
  * DEFAULT-add_c.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   146
  * DEFAULT-add_d.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   147
  3 - qsubmit commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   148
  
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   149
  * applied DEFAULT-add_a.diff
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   150
  2 - qsubmit commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   151
  
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   152
  * DEFAULT-add_a.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   153
  * DEFAULT-add_b.diff ready for review
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   154
  1 - qsubmit init
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   155
  0 - initial commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   156
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   157
  $ cd ..
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   158
  $ hg qclone -U local local2
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   159
  $ cd local2
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   160
  $ hg qlog
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   161
  3 - 47d2a3944de8 add d (draft)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   162
  2 - 4538525df7e2 add c (draft)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   163
  1 - 7c3bad9141dc add b (draft)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   164
  0 - 1f0dee641bb7 add a (public)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   165
  $ hg strip -n 1 --no-backup
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   166
  $ hg up
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   167
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   168
  $ hg up --mq 4
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   169
  6 files updated, 0 files merged, 0 files removed, 0 files unresolved
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   170
  $ hg qseries
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   171
  DEFAULT-add_b.diff
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   172
  DEFAULT-add_c.diff
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   173
  DEFAULT-add_d.diff
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   174
  $ hg qpush
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   175
  applying DEFAULT-add_b.diff
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   176
  now at: DEFAULT-add_b.diff
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   177
  $ hg qfinish -a
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   178
  $ hg phase -p .
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   179
  $ hg qci -m "applied DEFAULT-add_b.diff"
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   180
  $ cd ../local
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   181
  $ hg pull ../local2
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   182
  pulling from ../local2
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   183
  searching for changes
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   184
  no changes found
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   185
  $ hg pull --mq ../local2/.hg/patches
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   186
  pulling from ../local2/.hg/patches
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   187
  searching for changes
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   188
  adding changesets
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   189
  adding manifests
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   190
  adding file changes
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   191
  added 1 changesets with 1 changes to 1 files
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   192
  (run 'hg update' to get a working copy)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   193
  $ hg qlog
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   194
  3 - 47d2a3944de8 add d (draft)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   195
  2 - 4538525df7e2 add c (draft)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   196
  1 - 7c3bad9141dc add b (public)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   197
  0 - 1f0dee641bb7 add a (public)
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   198
  $ hg mqlog -l 1
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   199
  5 - applied DEFAULT-add_b.diff
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   200
  $ hg status --mq --rev tip:-2
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   201
  M series
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   202
  A DEFAULT-add_b.diff
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   203
  $ hg qsync -a
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   204
  $ hg status --mq --rev tip:-2
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   205
  M qsubmitdata
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   206
  $ hg mqlog -l 1
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   207
  6 - qsubmit commit
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   208
  
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   209
  * applied DEFAULT-add_b.diff
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   210
  $ hg qsync -a
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   211
  abort: Nothing changed
ff3158d0d7e8 qsync: support for synchronisation with applied patches from outer space and more
David Douard <david.douard@logilab.fr>
parents:
diff changeset
   212
  [255]
249
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   213
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   214
mixed sync
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   215
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   216
  $ hg init local
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   217
  $ cd local
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   218
  $ hg qinit -c
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   219
  $ mkcommit a
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   220
  $ mkcommit b
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   221
  $ hg qlog
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   222
  1 - 7c3bad9141dc add b (draft)
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   223
  0 - 1f0dee641bb7 add a (draft)
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   224
  $ hg qsync -a
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   225
  $ hg mqlog
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   226
  1 - qsubmit commit
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   227
  
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   228
  * DEFAULT-add_a.diff ready for review
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   229
  * DEFAULT-add_b.diff ready for review
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   230
  0 - qsubmit init
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   231
  $ hg phase -p 0
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   232
  $ echo "b" >> b
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   233
  $ hg amend
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   234
  $ hg qsync -a
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   235
  $ hg mqlog -l 1
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   236
  2 - qsubmit commit
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   237
  
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   238
  * applied DEFAULT-add_a.diff
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   239
  * DEFAULT-add_b.diff ready for review
bd0917068cc7 qsync: fix mq commit message generation
David Douard <david.douard@logilab.fr>
parents: 220
diff changeset
   240