Mercurial Mercurial > hg / annotate
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-absorb-phase.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Mon, 22 Feb 2021 12:21:00 +0100
changeset 46561 388a92023a1a
parent 40190 31dfa7dac4c9
permissions -rw-r--r--
test-copies: introduce merge chains test for the P/Q merges This is similar to the chaining test we have for the A/E merges. The current result of this tests is wrong, as for the other test of the same familly. This will be fixed by a later changesets. Differential Revision: https://phab.mercurial-scm.org/D10059
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
38917
5111d11b8719 absorb: import extension from Facebook's hg-experimental
Augie Fackler <augie@google.com>
parents:
diff changeset 
     1
 
  $ cat >> $HGRCPATH << EOF
5111d11b8719 absorb: import extension from Facebook's hg-experimental
Augie Fackler <augie@google.com>
parents:
diff changeset 
     2
 
  > [extensions]
5111d11b8719 absorb: import extension from Facebook's hg-experimental
Augie Fackler <augie@google.com>
parents:
diff changeset 
     3
 
  > absorb=
39667
0b7594ada0db tests: fix a couple of drawdag.py references
Augie Fackler <augie@google.com>
parents: 38917
diff changeset 
     4
 
  > drawdag=$TESTDIR/drawdag.py
38917
5111d11b8719 absorb: import extension from Facebook's hg-experimental
Augie Fackler <augie@google.com>
parents:
diff changeset 
     5
 
  > EOF
5111d11b8719 absorb: import extension from Facebook's hg-experimental
Augie Fackler <augie@google.com>
parents:
diff changeset 
     6
 












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     7


  $ hg init













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     8


  $ hg debugdrawdag <<'EOS'













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     9


  > C













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    10


  > |













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    11


  > B













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    12


  > |













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    13


  > A













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    14


  > EOS













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    15














5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    16


  $ hg phase -r A --public -q













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    17


  $ hg phase -r C --secret --force -q













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    18














5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    19


  $ hg update C -q













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    20


  $ printf B1 > B













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    21









40190






31dfa7dac4c9
absorb: prompt user to accept absorb changes by default



Mark Thomas <mbthomas@fb.com>


parents: 
39667

diff
changeset




    22


  $ hg absorb -aq








38917






5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    23














5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    24


  $ hg log -G -T '{desc} {phase}'













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    25


  @  C secret













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    26


  |













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    27


  o  B draft













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    28


  |













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    29


  o  A public













5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    30


  















Mercurial