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 Ry4an Brase <ry4an-hg@ry4an.org>
Wed, 14 Apr 2010 00:24:47 -0500
branchstable
changeset 10904 26d1d23e5a2b
parent 9815 49efeed49c94
permissions -rw-r--r--
Fix --blacklist when --jobs > 1 in run_tests.py. The options parsing logic replaces the options.blacklist initial value, a list of filenames, with a dict of test names to filenames. When runchildren rebuilds the command line to launch child processes the dict is flattened and provided as a malformed argument when a filename is expected. Fix is to remove the blacklist option from child invocations since the filtering is handled in the parent anyway.
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