Mercurial Mercurial > pub > hg > evolve / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-stabilize-result.t
changeset 492 7ecd41520dae
parent 491 6989d8fe4ed2
child 517 0bc0c9edcb15
equal deleted inserted replaced
491:6989d8fe4ed2 492:7ecd41520dae 
    10   $ glog() {
 
    10   $ glog() {
 
    11   >   hg glog --template \
 
    11   >   hg glog --template \
 
    12   >     '{rev}:{node|short}@{branch}({phase}) bk:[{bookmarks}] {desc|firstline}\n' "$@"
 
    12   >     '{rev}:{node|short}@{branch}({phase}) bk:[{bookmarks}] {desc|firstline}\n' "$@"
 
    13   > }
 
    13   > }
 
    14 
    14 
    15 Test stabilize removing the changeset being stabilized
 
    15 Test evolve removing the changeset being evolved
 
    16 
    16 
    17   $ hg init empty
 
    17   $ hg init empty
 
    18   $ cd empty
 
    18   $ cd empty
 
    19   $ echo a > a
 
    19   $ echo a > a
 
    20   $ hg ci -Am adda a
 
    20   $ hg ci -Am adda a
 
    26   $ hg up 1
 
    26   $ hg up 1
 
    27   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    27   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    28   $ echo a >> a
 
    28   $ echo a >> a
 
    29   $ hg amend -m changea
 
    29   $ hg amend -m changea
 
    30   1 new unstable changesets
 
    30   1 new unstable changesets
 
    31   $ hg stabilize -v
 
    31   $ hg evolve -v
 
    32   move:[2] changea
 
    32   move:[2] changea
 
    33   atop:[4] changea
 
    33   atop:[4] changea
 
    34   hg rebase -Dr cce2c55b8965 -d 1447e1c4828d
 
    34   hg rebase -Dr cce2c55b8965 -d 1447e1c4828d
 
    35   resolving manifests
 
    35   resolving manifests
 
    36   $ glog --hidden
 
    36   $ glog --hidden
 
    47   $ hg debugobsolete
 
    47   $ hg debugobsolete
 
    48   41ad4fe8c79565a06c89f032ef0937b3cbd68a04 1447e1c4828d2347df8f858aa041305fa4cf7db1 0 {'date': '* *', 'user': 'test'} (glob)
 
    48   41ad4fe8c79565a06c89f032ef0937b3cbd68a04 1447e1c4828d2347df8f858aa041305fa4cf7db1 0 {'date': '* *', 'user': 'test'} (glob)
 
    49   102a90ea7b4a3361e4082ed620918c261189a36a 1447e1c4828d2347df8f858aa041305fa4cf7db1 0 {'date': '* *', 'user': 'test'} (glob)
 
    49   102a90ea7b4a3361e4082ed620918c261189a36a 1447e1c4828d2347df8f858aa041305fa4cf7db1 0 {'date': '* *', 'user': 'test'} (glob)
 
    50   cce2c55b896511e0b6e04173c9450ba822ebc740 0 {'date': '* *', 'user': 'test'} (glob)
 
    50   cce2c55b896511e0b6e04173c9450ba822ebc740 0 {'date': '* *', 'user': 'test'} (glob)
 
    51 
    51 
    52 Test stabilize with conflict
 
    52 Test evolve with conflict
 
    53 
    53 
    54   $ ls
 
    54   $ ls
 
    55   a
 
    55   a
 
    56   b
 
    56   b
 
    57   $ hg pdiff a
 
    57   $ hg pdiff a
 
    67   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    67   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    68   [4] changea
 
    68   [4] changea
 
    69   $ echo 'a' > a
 
    69   $ echo 'a' > a
 
    70   $ hg amend
 
    70   $ hg amend
 
    71   1 new unstable changesets
 
    71   1 new unstable changesets
 
    72   $ hg stabilize
 
    72   $ hg evolve
 
    73   move:[5] newer a
 
    73   move:[5] newer a
 
    74   atop:[7] changea
 
    74   atop:[7] changea
 
    75   merging a
 
    75   merging a
 
    76   warning: conflicts during merge.
 
    76   warning: conflicts during merge.
 
    77   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
 
    77   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
 
    78   stabilize failed!
 
    78   evolve failed!
 
    79   fix conflict and run "hg stabilize --continue"
 
    79   fix conflict and run "hg evolve --continue"
 
    80   abort: unresolved merge conflicts (see hg help resolve)
 
    80   abort: unresolved merge conflicts (see hg help resolve)
 
    81   [255]
 
    81   [255]
 
    82   $ hg revert -r 'unstable()' a
 
    82   $ hg revert -r 'unstable()' a
 
    83   $ hg diff
 
    83   $ hg diff
 
    84   diff -r e8cc1b534401 a
 
    84   diff -r e8cc1b534401 a
 
    86   +++ b/a	* (glob)
 
    86   +++ b/a	* (glob)
 
    87   @@ -1,1 +1,3 @@
 
    87   @@ -1,1 +1,3 @@
 
    88    a
 
    88    a
 
    89   +a
 
    89   +a
 
    90   +newer a
 
    90   +newer a
 
    91   $ hg stabilize --continue
 
    91   $ hg evolve --continue
 
    92   grafting revision 5
 
    92   grafting revision 5
 
    93   abort: unresolved merge conflicts (see hg help resolve)
 
    93   abort: unresolved merge conflicts (see hg help resolve)
 
    94   [255]
 
    94   [255]
 
    95   $ hg resolve -m a
 
    95   $ hg resolve -m a
 
    96   $ hg stabilize --continue
 
    96   $ hg evolve --continue
 
    97   grafting revision 5
 
    97   grafting revision 5
 
    98 
    98 
    99 Stabilize of late comer with different parent
 
    99 Stabilize of late comer with different parent
 
   100 ==================================================
 
   100 ==================================================
 
   101 
   101 
   144   o  0:07f494440405@default(public) bk:[] adda
 
   144   o  0:07f494440405@default(public) bk:[] adda
 
   145   
   145   
   146 
   146 
   147 Stabilize !
 
   147 Stabilize !
 
   148 
   148 
   149   $ hg stabilize --any --dry-run
 
   149   $ hg evolve --any --dry-run
 
   150   recreate:[12] newer a
 
   150   recreate:[12] newer a
 
   151   atop:[8] newer a
 
   151   atop:[8] newer a
 
   152   hg rebase --rev 15c83af6f3a3 --detach e8cc1b534401;
 
   152   hg rebase --rev 15c83af6f3a3 --detach e8cc1b534401;
 
   153   hg update e3183e9c0961;
 
   153   hg update e3183e9c0961;
 
   154   hg revert --all --rev 15c83af6f3a3;
 
   154   hg revert --all --rev 15c83af6f3a3;
 
   155   hg commit --msg "latecomer update to %s" (no-eol)
 
   155   hg commit --msg "latecomer update to %s" (no-eol)
 
   156   $ hg stabilize --any
 
   156   $ hg evolve --any
 
   157   recreate:[12] newer a
 
   157   recreate:[12] newer a
 
   158   atop:[8] newer a
 
   158   atop:[8] newer a
 
   159   rebasing to destination parent: e8cc1b534401
 
   159   rebasing to destination parent: e8cc1b534401
 
   160   computing new diff
 
   160   computing new diff
 
   161   commited as 1d94fef80e85
 
   161   commited as 1d94fef80e85
 
   227   o  0:07f494440405@default(public) bk:[] adda
 
   227   o  0:07f494440405@default(public) bk:[] adda
 
   228   
   228   
   229 
   229 
   230 Stabilize It
 
   230 Stabilize It
 
   231 
   231 
   232   $ hg stabilize -qn
 
   232   $ hg evolve -qn
 
   233   hg update -c 3883461cc228 &&
 
   233   hg update -c 3883461cc228 &&
 
   234   hg merge 4754d61bc2db && 
   234   hg merge 4754d61bc2db && 
   235   hg commit -m "auto merge resolving conflict between 3883461cc228 and 4754d61bc2db"&&
 
   235   hg commit -m "auto merge resolving conflict between 3883461cc228 and 4754d61bc2db"&&
 
   236   hg up -C 7391601a4bfa &&
 
   236   hg up -C 7391601a4bfa &&
 
   237   hg revert --all --rev tip &&
 
   237   hg revert --all --rev tip &&
 
   238   hg commit -m "`hg log -r 3883461cc228 --template={desc}`";
 
   238   hg commit -m "`hg log -r 3883461cc228 --template={desc}`";
 
   239   $ hg stabilize -v
 
   239   $ hg evolve -v
 
   240   merge:[19] More addition
 
   240   merge:[19] More addition
 
   241   with: [17] More addition
 
   241   with: [17] More addition
 
   242   base: [15] More addition
 
   242   base: [15] More addition
 
   243   merging conflicting changeset
 
   243   merging conflicting changeset
 
   244   resolving manifests
 
   244   resolving manifests
 
   245   merging a
 
   245   merging a
 
   246   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
   246   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
   247   a
 
   247   a
 
   248   a
 
   248   a
 
   249   $ hg st
 
   249   $ hg st
 
   250   $ hg amend -d '0 0' -m 'More addition' # kill date variation XXX should be done in stabilize
 
   250   $ hg amend -d '0 0' -m 'More addition' # kill date variation XXX should be done in evolve
 
   251   $ glog
 
   251   $ glog
 
   252   @  22:ac6d600735a4@default(draft) bk:[] More addition
 
   252   @  22:ac6d600735a4@default(draft) bk:[] More addition
 
   253   |
 
   253   |
 
   254   | o  14:1d94fef80e85@default(draft) bk:[] latecomer update to e3183e9c0961:
 
   254   | o  14:1d94fef80e85@default(draft) bk:[] latecomer update to e3183e9c0961:
 
   255   | |
 
   255   | |
evolve