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-rebase-newancestor.out
author David Champion <dgc@uchicago.edu>
Mon, 10 May 2010 11:04:56 -0500
changeset 11148 a912f26777d3
parent 9815 49efeed49c94
permissions -rw-r--r--
merge: introduce tool.check parameter tool.check is a list of check options, and can be used in place of tool.checkchanged and tool.checkconflicts: Equivalences: tool.checkchanged = yes tool.checkconflicts = no tool.check = changed tool.checkchanged = no tool.checkconflicts = yes tool.check = conflicts tool.checkchanged = yes tool.checkconflicts = yes tool.check = changed, conflicts Add _toollist() wrapper for ui.configlist() to implement this consistently. checkchanged and checkconflicts are still supported, but check is preferred for implementing new check options.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9815
49efeed49c94 rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff changeset 
     1
 
adding a
49efeed49c94 rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff changeset 
     2
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
49efeed49c94 rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff changeset 
     3
 
created new head
49efeed49c94 rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff changeset 
     4
 
@  3:AD 1d4e82ed3c2a
49efeed49c94 rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff changeset 
     5
 
|
49efeed49c94 rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff changeset 
     6
 
| o  2:C 7e1afe9214b2
49efeed49c94 rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff changeset 
     7
 
| |
49efeed49c94 rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff changeset 
     8
 
| o  1:B 0a6620c3c26a
49efeed49c94 rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff changeset 
     9
 
|/
49efeed49c94 rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff changeset 
    10
 
o  0:A 1e635d440a73
49efeed49c94 rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff changeset 
    11
 












49efeed49c94
rebase: make sure the newancestor is used during the whole update



Christian Boos <cboos@bct-technology.com>


parents: 

diff
changeset




    12


@  3:C 0c5887756284













49efeed49c94
rebase: make sure the newancestor is used during the whole update



Christian Boos <cboos@bct-technology.com>


parents: 

diff
changeset




    13


|













49efeed49c94
rebase: make sure the newancestor is used during the whole update



Christian Boos <cboos@bct-technology.com>


parents: 

diff
changeset




    14


o  2:B 4f208f4a1507













49efeed49c94
rebase: make sure the newancestor is used during the whole update



Christian Boos <cboos@bct-technology.com>


parents: 

diff
changeset




    15


|













49efeed49c94
rebase: make sure the newancestor is used during the whole update



Christian Boos <cboos@bct-technology.com>


parents: 

diff
changeset




    16


o  1:AD 1d4e82ed3c2a













49efeed49c94
rebase: make sure the newancestor is used during the whole update



Christian Boos <cboos@bct-technology.com>


parents: 

diff
changeset




    17


|













49efeed49c94
rebase: make sure the newancestor is used during the whole update



Christian Boos <cboos@bct-technology.com>


parents: 

diff
changeset




    18


o  0:A 1e635d440a73













49efeed49c94
rebase: make sure the newancestor is used during the whole update



Christian Boos <cboos@bct-technology.com>


parents: 

diff
changeset




    19
















Mercurial